aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/gadget/pxa2xx_udc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/gadget/pxa2xx_udc.c')
-rw-r--r--drivers/usb/gadget/pxa2xx_udc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 3173b39f0bfd..8c139d416ac4 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2099,7 +2099,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
2099 /* insist on Intel/ARM/XScale */ 2099 /* insist on Intel/ARM/XScale */
2100 asm("mrc%? p15, 0, %0, c0, c0" : "=r" (chiprev)); 2100 asm("mrc%? p15, 0, %0, c0, c0" : "=r" (chiprev));
2101 if ((chiprev & CP15R0_VENDOR_MASK) != CP15R0_XSCALE_VALUE) { 2101 if ((chiprev & CP15R0_VENDOR_MASK) != CP15R0_XSCALE_VALUE) {
2102 printk(KERN_ERR "%s: not XScale!\n", driver_name); 2102 pr_err("%s: not XScale!\n", driver_name);
2103 return -ENODEV; 2103 return -ENODEV;
2104 } 2104 }
2105 2105
@@ -2128,7 +2128,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
2128 break; 2128 break;
2129#endif 2129#endif
2130 default: 2130 default:
2131 printk(KERN_ERR "%s: unrecognized processor: %08x\n", 2131 pr_err("%s: unrecognized processor: %08x\n",
2132 driver_name, chiprev); 2132 driver_name, chiprev);
2133 /* iop3xx, ixp4xx, ... */ 2133 /* iop3xx, ixp4xx, ... */
2134 return -ENODEV; 2134 return -ENODEV;
@@ -2199,7 +2199,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
2199 retval = request_irq(irq, pxa2xx_udc_irq, 2199 retval = request_irq(irq, pxa2xx_udc_irq,
2200 IRQF_DISABLED, driver_name, dev); 2200 IRQF_DISABLED, driver_name, dev);
2201 if (retval != 0) { 2201 if (retval != 0) {
2202 printk(KERN_ERR "%s: can't get irq %d, err %d\n", 2202 pr_err("%s: can't get irq %d, err %d\n",
2203 driver_name, irq, retval); 2203 driver_name, irq, retval);
2204 goto err_irq1; 2204 goto err_irq1;
2205 } 2205 }
@@ -2212,7 +2212,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
2212 IRQF_DISABLED | IRQF_SAMPLE_RANDOM, 2212 IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
2213 driver_name, dev); 2213 driver_name, dev);
2214 if (retval != 0) { 2214 if (retval != 0) {
2215 printk(KERN_ERR "%s: can't get irq %i, err %d\n", 2215 pr_err("%s: can't get irq %i, err %d\n",
2216 driver_name, LUBBOCK_USB_DISC_IRQ, retval); 2216 driver_name, LUBBOCK_USB_DISC_IRQ, retval);
2217lubbock_fail0: 2217lubbock_fail0:
2218 goto err_irq_lub; 2218 goto err_irq_lub;
@@ -2222,7 +2222,7 @@ lubbock_fail0:
2222 IRQF_DISABLED | IRQF_SAMPLE_RANDOM, 2222 IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
2223 driver_name, dev); 2223 driver_name, dev);
2224 if (retval != 0) { 2224 if (retval != 0) {
2225 printk(KERN_ERR "%s: can't get irq %i, err %d\n", 2225 pr_err("%s: can't get irq %i, err %d\n",
2226 driver_name, LUBBOCK_USB_IRQ, retval); 2226 driver_name, LUBBOCK_USB_IRQ, retval);
2227 free_irq(LUBBOCK_USB_DISC_IRQ, dev); 2227 free_irq(LUBBOCK_USB_DISC_IRQ, dev);
2228 goto lubbock_fail0; 2228 goto lubbock_fail0;
@@ -2235,7 +2235,7 @@ lubbock_fail0:
2235 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, 2235 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
2236 driver_name, dev); 2236 driver_name, dev);
2237 if (retval != 0) { 2237 if (retval != 0) {
2238 printk(KERN_ERR "%s: can't get irq %i, err %d\n", 2238 pr_err("%s: can't get irq %i, err %d\n",
2239 driver_name, vbus_irq, retval); 2239 driver_name, vbus_irq, retval);
2240 goto err_vbus_irq; 2240 goto err_vbus_irq;
2241 } 2241 }
@@ -2361,7 +2361,7 @@ static struct platform_driver udc_driver = {
2361 2361
2362static int __init udc_init(void) 2362static int __init udc_init(void)
2363{ 2363{
2364 printk(KERN_INFO "%s: version %s\n", driver_name, DRIVER_VERSION); 2364 pr_info("%s: version %s\n", driver_name, DRIVER_VERSION);
2365 return platform_driver_probe(&udc_driver, pxa2xx_udc_probe); 2365 return platform_driver_probe(&udc_driver, pxa2xx_udc_probe);
2366} 2366}
2367module_init(udc_init); 2367module_init(udc_init);