Skip to content

Commit 802f389

Browse files
gregkhgregkh
committed
USB: remove err() macro from more usb drivers
USB should not be having it's own printk macros, so remove err() and use the system-wide standard of dev_err() wherever possible. In the few places that will not work out, use a basic printk(). Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent fd3f191 commit 802f389

File tree

4 files changed

+63
-45
lines changed

4 files changed

+63
-45
lines changed

‎drivers/usb/host/isp1760-if.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int __devinit isp1761_pci_probe(struct pci_dev *dev,
218218
* and reading back and checking the contents are same or not
219219
*/
220220
if (reg_data != 0xFACE) {
221-
err("scratch register mismatch %x", reg_data);
221+
dev_err(&dev->dev, "scratch register mismatch %x\n", reg_data);
222222
goto clean;
223223
}
224224

‎drivers/usb/host/r8a66597-hcd.c

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
118118
r8a66597_write(r8a66597, SCKE, SYSCFG0);
119119
tmp = r8a66597_read(r8a66597, SYSCFG0);
120120
if (i++ > 1000) {
121-
err("register access fail.");
121+
printk(KERN_ERR "r8a66597: register access fail.\n");
122122
return -ENXIO;
123123
}
124124
} while ((tmp & SCKE) != SCKE);
@@ -128,7 +128,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
128128
r8a66597_write(r8a66597, USBE, SYSCFG0);
129129
tmp = r8a66597_read(r8a66597, SYSCFG0);
130130
if (i++ > 1000) {
131-
err("register access fail.");
131+
printk(KERN_ERR "r8a66597: register access fail.\n");
132132
return -ENXIO;
133133
}
134134
} while ((tmp & USBE) != USBE);
@@ -141,7 +141,7 @@ static int r8a66597_clock_enable(struct r8a66597 *r8a66597)
141141
msleep(1);
142142
tmp = r8a66597_read(r8a66597, SYSCFG0);
143143
if (i++ > 500) {
144-
err("register access fail.");
144+
printk(KERN_ERR "r8a66597: register access fail.\n");
145145
return -ENXIO;
146146
}
147147
} while ((tmp & SCKE) != SCKE);
@@ -265,7 +265,7 @@ static void get_port_number(char *devpath, u16 *root_port, u16 *hub_port)
265265
if (root_port) {
266266
*root_port = (devpath[0] & 0x0F) - 1;
267267
if (*root_port >= R8A66597_MAX_ROOT_HUB)
268-
err("illegal root port number");
268+
printk(KERN_ERR "r8a66597: Illegal root port number.\n");
269269
}
270270
if (hub_port)
271271
*hub_port = devpath[2] & 0x0F;
@@ -286,7 +286,7 @@ static u16 get_r8a66597_usb_speed(enum usb_device_speed speed)
286286
usbspd = HSMODE;
287287
break;
288288
default:
289-
err("unknown speed");
289+
printk(KERN_ERR "r8a66597: unknown speed\n");
290290
break;
291291
}
292292

@@ -385,7 +385,7 @@ static u8 alloc_usb_address(struct r8a66597 *r8a66597, struct urb *urb)
385385
struct r8a66597_device *dev;
386386

387387
if (is_hub_limit(urb->dev->devpath)) {
388-
err("Externel hub limit reached.");
388+
dev_err(&urb->dev->dev, "External hub limit reached.\n");
389389
return 0;
390390
}
391391

@@ -406,8 +406,9 @@ static u8 alloc_usb_address(struct r8a66597 *r8a66597, struct urb *urb)
406406
return addr;
407407
}
408408

409-
err("cannot communicate with a USB device more than 10.(%x)",
410-
r8a66597->address_map);
409+
dev_err(&urb->dev->dev,
410+
"cannot communicate with a USB device more than 10.(%x)\n",
411+
r8a66597->address_map);
411412

412413
return 0;
413414
}
@@ -447,7 +448,8 @@ static void r8a66597_reg_wait(struct r8a66597 *r8a66597, unsigned long reg,
447448
do {
448449
tmp = r8a66597_read(r8a66597, reg);
449450
if (i++ > 1000000) {
450-
err("register%lx, loop %x is timeout", reg, loop);
451+
printk(KERN_ERR "r8a66597: register%lx, loop %x "
452+
"is timeout\n", reg, loop);
451453
break;
452454
}
453455
ndelay(1);
@@ -675,7 +677,7 @@ static u16 get_empty_pipenum(struct r8a66597 *r8a66597,
675677
array[i++] = 1;
676678
break;
677679
default:
678-
err("Illegal type");
680+
printk(KERN_ERR "r8a66597: Illegal type\n");
679681
return 0;
680682
}
681683

@@ -705,7 +707,7 @@ static u16 get_r8a66597_type(__u8 type)
705707
r8a66597_type = R8A66597_ISO;
706708
break;
707709
default:
708-
err("Illegal type");
710+
printk(KERN_ERR "r8a66597: Illegal type\n");
709711
r8a66597_type = 0x0000;
710712
break;
711713
}
@@ -724,7 +726,7 @@ static u16 get_bufnum(u16 pipenum)
724726
else if (check_interrupt(pipenum))
725727
bufnum = 4 + (pipenum - 6);
726728
else
727-
err("Illegal pipenum (%d)", pipenum);
729+
printk(KERN_ERR "r8a66597: Illegal pipenum (%d)\n", pipenum);
728730

729731
return bufnum;
730732
}
@@ -740,7 +742,7 @@ static u16 get_buf_bsize(u16 pipenum)
740742
else if (check_interrupt(pipenum))
741743
buf_bsize = 0;
742744
else
743-
err("Illegal pipenum (%d)", pipenum);
745+
printk(KERN_ERR "r8a66597: Illegal pipenum (%d)\n", pipenum);
744746

745747
return buf_bsize;
746748
}
@@ -1189,7 +1191,7 @@ static int start_transfer(struct r8a66597 *r8a66597, struct r8a66597_td *td)
11891191
prepare_status_packet(r8a66597, td);
11901192
break;
11911193
default:
1192-
err("invalid type.");
1194+
printk(KERN_ERR "r8a66597: invalid type.\n");
11931195
break;
11941196
}
11951197

@@ -1297,7 +1299,7 @@ static void packet_read(struct r8a66597 *r8a66597, u16 pipenum)
12971299
if (unlikely((tmp & FRDY) == 0)) {
12981300
pipe_stop(r8a66597, td->pipe);
12991301
pipe_irq_disable(r8a66597, pipenum);
1300-
err("in fifo not ready (%d)", pipenum);
1302+
printk(KERN_ERR "r8a66597: in fifo not ready (%d)\n", pipenum);
13011303
finish_request(r8a66597, td, pipenum, td->urb, -EPIPE);
13021304
return;
13031305
}
@@ -1372,7 +1374,7 @@ static void packet_write(struct r8a66597 *r8a66597, u16 pipenum)
13721374
if (unlikely((tmp & FRDY) == 0)) {
13731375
pipe_stop(r8a66597, td->pipe);
13741376
pipe_irq_disable(r8a66597, pipenum);
1375-
err("out write fifo not ready. (%d)", pipenum);
1377+
printk(KERN_ERR "r8a66597: out fifo not ready (%d)\n", pipenum);
13761378
finish_request(r8a66597, td, pipenum, urb, -EPIPE);
13771379
return;
13781380
}
@@ -2007,7 +2009,7 @@ static struct r8a66597_device *get_r8a66597_device(struct r8a66597 *r8a66597,
20072009
return dev;
20082010
}
20092011

2010-
err("get_r8a66597_device fail.(%d)\n", addr);
2012+
printk(KERN_ERR "r8a66597: get_r8a66597_device fail.(%d)\n", addr);
20112013
return NULL;
20122014
}
20132015

@@ -2276,22 +2278,23 @@ static int __init r8a66597_probe(struct platform_device *pdev)
22762278

22772279
if (pdev->dev.dma_mask) {
22782280
ret = -EINVAL;
2279-
err("dma not support");
2281+
dev_err(&pdev->dev, "dma not supported\n");
22802282
goto clean_up;
22812283
}
22822284

22832285
res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
22842286
(char *)hcd_name);
22852287
if (!res) {
22862288
ret = -ENODEV;
2287-
err("platform_get_resource_byname error.");
2289+
dev_err(&pdev->dev, "platform_get_resource_byname error.\n");
22882290
goto clean_up;
22892291
}
22902292

22912293
ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
22922294
if (!ires) {
22932295
ret = -ENODEV;
2294-
err("platform_get_resource IORESOURCE_IRQ error.");
2296+
dev_err(&pdev->dev,
2297+
"platform_get_resource IORESOURCE_IRQ error.\n");
22952298
goto clean_up;
22962299
}
22972300

@@ -2301,15 +2304,15 @@ static int __init r8a66597_probe(struct platform_device *pdev)
23012304
reg = ioremap(res->start, resource_len(res));
23022305
if (reg == NULL) {
23032306
ret = -ENOMEM;
2304-
err("ioremap error.");
2307+
dev_err(&pdev->dev, "ioremap error.\n");
23052308
goto clean_up;
23062309
}
23072310

23082311
/* initialize hcd */
23092312
hcd = usb_create_hcd(&r8a66597_hc_driver, &pdev->dev, (char *)hcd_name);
23102313
if (!hcd) {
23112314
ret = -ENOMEM;
2312-
err("Failed to create hcd");
2315+
dev_err(&pdev->dev, "Failed to create hcd\n");
23132316
goto clean_up;
23142317
}
23152318
r8a66597 = hcd_to_r8a66597(hcd);
@@ -2355,12 +2358,12 @@ static int __init r8a66597_probe(struct platform_device *pdev)
23552358
}
23562359
break;
23572360
default:
2358-
err("Unknown irq_sense value.");
2361+
dev_err(&pdev->dev, "Unknown irq_sense value.\n");
23592362
}
23602363

23612364
ret = usb_add_hcd(hcd, irq, IRQF_DISABLED | irq_trigger);
23622365
if (ret != 0) {
2363-
err("Failed to add hcd");
2366+
dev_err(&pdev->dev, "Failed to add hcd\n");
23642367
goto clean_up;
23652368
}
23662369

‎drivers/usb/image/mdc800.c

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)
355355
if (mdc800->camera_request_ready>0)
356356
{
357357
mdc800->camera_request_ready=0;
358-
err ("timeout waiting for camera.");
358+
dev_err(&mdc800->dev->dev, "timeout waiting for camera.\n");
359359
return -1;
360360
}
361361

@@ -380,7 +380,8 @@ static void mdc800_usb_write_notify (struct urb *urb)
380380
int status = urb->status;
381381

382382
if (status != 0)
383-
err ("writing command fails (status=%i)", status);
383+
dev_err(&mdc800->dev->dev,
384+
"writing command fails (status=%i)\n", status);
384385
else
385386
mdc800->state=READY;
386387
mdc800->written = 1;
@@ -407,7 +408,8 @@ static void mdc800_usb_download_notify (struct urb *urb)
407408
mdc800->state=READY;
408409
}
409410
} else {
410-
err ("request bytes fails (status:%i)", status);
411+
dev_err(&mdc800->dev->dev,
412+
"request bytes fails (status:%i)\n", status);
411413
}
412414
mdc800->downloaded = 1;
413415
wake_up (&mdc800->download_wait);
@@ -450,7 +452,8 @@ static int mdc800_usb_probe (struct usb_interface *intf,
450452

451453
if (dev->descriptor.bNumConfigurations != 1)
452454
{
453-
err ("probe fails -> wrong Number of Configuration");
455+
dev_err(&intf->dev,
456+
"probe fails -> wrong Number of Configuration\n");
454457
return -ENODEV;
455458
}
456459
intf_desc = intf->cur_altsetting;
@@ -462,7 +465,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
462465
|| ( intf_desc->desc.bNumEndpoints != 4)
463466
)
464467
{
465-
err ("probe fails -> wrong Interface");
468+
dev_err(&intf->dev, "probe fails -> wrong Interface\n");
466469
return -ENODEV;
467470
}
468471

@@ -483,7 +486,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
483486
}
484487
if (mdc800->endpoint[i] == -1)
485488
{
486-
err ("probe fails -> Wrong Endpoints.");
489+
dev_err(&intf->dev, "probe fails -> Wrong Endpoints.\n");
487490
return -ENODEV;
488491
}
489492
}
@@ -495,7 +498,7 @@ static int mdc800_usb_probe (struct usb_interface *intf,
495498

496499
retval = usb_register_dev(intf, &mdc800_class);
497500
if (retval) {
498-
err ("Not able to get a minor for this device.");
501+
dev_err(&intf->dev, "Not able to get a minor for this device.\n");
499502
return -ENODEV;
500503
}
501504

@@ -645,7 +648,8 @@ static int mdc800_device_open (struct inode* inode, struct file *file)
645648
mdc800->irq_urb->dev = mdc800->dev;
646649
retval = usb_submit_urb (mdc800->irq_urb, GFP_KERNEL);
647650
if (retval) {
648-
err ("request USB irq fails (submit_retval=%i).", retval);
651+
dev_err(&mdc800->dev->dev,
652+
"request USB irq fails (submit_retval=%i).\n", retval);
649653
errn = -EIO;
650654
goto error_out;
651655
}
@@ -735,7 +739,9 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
735739
mdc800->download_urb->dev = mdc800->dev;
736740
retval = usb_submit_urb (mdc800->download_urb, GFP_KERNEL);
737741
if (retval) {
738-
err ("Can't submit download urb (retval=%i)",retval);
742+
dev_err(&mdc800->dev->dev,
743+
"Can't submit download urb "
744+
"(retval=%i)\n", retval);
739745
mutex_unlock(&mdc800->io_lock);
740746
return len-left;
741747
}
@@ -744,7 +750,10 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
744750
mdc800->downloaded = 0;
745751
if (mdc800->download_urb->status != 0)
746752
{
747-
err ("request download-bytes fails (status=%i)",mdc800->download_urb->status);
753+
dev_err(&mdc800->dev->dev,
754+
"request download-bytes fails "
755+
"(status=%i)\n",
756+
mdc800->download_urb->status);
748757
mutex_unlock(&mdc800->io_lock);
749758
return len-left;
750759
}
@@ -841,7 +850,8 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
841850

842851
if (mdc800_usb_waitForIRQ (0,TO_GET_READY))
843852
{
844-
err ("Camera didn't get ready.\n");
853+
dev_err(&mdc800->dev->dev,
854+
"Camera didn't get ready.\n");
845855
mutex_unlock(&mdc800->io_lock);
846856
return -EIO;
847857
}
@@ -853,7 +863,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
853863
mdc800->write_urb->dev = mdc800->dev;
854864
retval = usb_submit_urb (mdc800->write_urb, GFP_KERNEL);
855865
if (retval) {
856-
err ("submitting write urb fails (retval=%i)", retval);
866+
dev_err(&mdc800->dev->dev,
867+
"submitting write urb fails "
868+
"(retval=%i)\n", retval);
857869
mutex_unlock(&mdc800->io_lock);
858870
return -EIO;
859871
}
@@ -872,7 +884,9 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
872884
case 0x3e: /* Take shot in Fine Mode (WCam Mode) */
873885
if (mdc800->pic_len < 0)
874886
{
875-
err ("call 0x07 before 0x05,0x3e");
887+
dev_err(&mdc800->dev->dev,
888+
"call 0x07 before "
889+
"0x05,0x3e\n");
876890
mdc800->state=READY;
877891
mutex_unlock(&mdc800->io_lock);
878892
return -EIO;
@@ -892,7 +906,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
892906

893907
if (mdc800_usb_waitForIRQ (1,TO_READ_FROM_IRQ))
894908
{
895-
err ("requesting answer from irq fails");
909+
dev_err(&mdc800->dev->dev, "requesting answer from irq fails\n");
896910
mutex_unlock(&mdc800->io_lock);
897911
return -EIO;
898912
}
@@ -920,7 +934,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
920934
{
921935
if (mdc800_usb_waitForIRQ (0,TO_DEFAULT_COMMAND))
922936
{
923-
err ("Command Timeout.");
937+
dev_err(&mdc800->dev->dev, "Command Timeout.\n");
924938
mutex_unlock(&mdc800->io_lock);
925939
return -EIO;
926940
}
@@ -1031,7 +1045,7 @@ static int __init usb_mdc800_init (void)
10311045

10321046
if (mdc800 != NULL)
10331047
{
1034-
err ("can't alloc memory!");
1048+
printk(KERN_ERR "mdc800: can't alloc memory!\n");
10351049

10361050
kfree(mdc800->download_urb_buffer);
10371051
kfree(mdc800->write_urb_buffer);

0 commit comments

Comments
 (0)