diff options
Diffstat (limited to 'arch/mips/alchemy/common/usb.c')
| -rw-r--r-- | arch/mips/alchemy/common/usb.c | 26 | 
1 files changed, 2 insertions, 24 deletions
diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c index 2adc7edda49..d193dbea84a 100644 --- a/arch/mips/alchemy/common/usb.c +++ b/arch/mips/alchemy/common/usb.c @@ -355,47 +355,25 @@ static inline void __au1200_udc_control(void __iomem *base, int enable)  	}  } -static inline int au1200_coherency_bug(void) -{ -#if defined(CONFIG_DMA_COHERENT) -	/* Au1200 AB USB does not support coherent memory */ -	if (!(read_c0_prid() & PRID_REV_MASK)) { -		printk(KERN_INFO "Au1200 USB: this is chip revision AB !!\n"); -		printk(KERN_INFO "Au1200 USB: update your board or re-configure" -				 " the kernel\n"); -		return -ENODEV; -	} -#endif -	return 0; -} -  static inline int au1200_usb_control(int block, int enable)  {  	void __iomem *base =  			(void __iomem *)KSEG1ADDR(AU1200_USB_CTL_PHYS_ADDR); -	int ret = 0;  	switch (block) {  	case ALCHEMY_USB_OHCI0: -		ret = au1200_coherency_bug(); -		if (ret && enable) -			goto out;  		__au1200_ohci_control(base, enable);  		break;  	case ALCHEMY_USB_UDC0:  		__au1200_udc_control(base, enable);  		break;  	case ALCHEMY_USB_EHCI0: -		ret = au1200_coherency_bug(); -		if (ret && enable) -			goto out;  		__au1200_ehci_control(base, enable);  		break;  	default: -		ret = -ENODEV; +		return -ENODEV;  	} -out: -	return ret; +	return 0;  }  | 
