leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

w1/masters: use pr_* instead of printk

Browse Source 
This patch replaces all calls to the "printk" function within the "masters"
subdirectory by calls to the appropriate "pr_*" function thus addressing
the following warning generated by the checkpatch script:

WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ...
        then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

Signed-off-by: Fjodor Schelichow <fjodor.schelichow@hotmail.com>
Signed-off-by: Roman Sommer <romsom2@yahoo.de>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Fjodor Schelichow 2014-06-19 02:52:01 +02:00 committed by Greg Kroah-Hartman
parent fdc9167a78
commit 1fda569090
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/w1/masters/ds1wm.c
View File

@ -563,7 +563,7 @@ static struct platform_driver ds1wm_driver = {
static int __init ds1wm_init(void) static int __init ds1wm_init(void)
{ {
printk("DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n"); pr_info("DS1WM w1 busmaster driver - (c) 2004 Szabolcs Gyurko\n");
return platform_driver_register(&ds1wm_driver); return platform_driver_register(&ds1wm_driver);
} }

2
drivers/w1/masters/ds2482.c
View File

@ -226,7 +226,7 @@ static int ds2482_wait_1wire_idle(struct ds2482_data *pdev)
} }
if (retries >= DS2482_WAIT_IDLE_TIMEOUT) if (retries >= DS2482_WAIT_IDLE_TIMEOUT)
printk(KERN_ERR "%s: timeout on channel %d\n", pr_err("%s: timeout on channel %d\n",
__func__, pdev->channel); __func__, pdev->channel);
return temp; return temp;

50
drivers/w1/masters/ds2490.c
View File

@ -206,7 +206,7 @@ static int ds_send_control_cmd(struct ds_device *dev, u16 value, u16 index)
err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, dev->ep[EP_CONTROL]), err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, dev->ep[EP_CONTROL]),
CONTROL_CMD, VENDOR, value, index, NULL, 0, 1000); CONTROL_CMD, VENDOR, value, index, NULL, 0, 1000);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "Failed to send command control message %x.%x: err=%d.\n", pr_err("Failed to send command control message %x.%x: err=%d.\n",
value, index, err); value, index, err);
return err; return err;
} }
@ -221,7 +221,7 @@ static int ds_send_control_mode(struct ds_device *dev, u16 value, u16 index)
err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, dev->ep[EP_CONTROL]), err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, dev->ep[EP_CONTROL]),
MODE_CMD, VENDOR, value, index, NULL, 0, 1000); MODE_CMD, VENDOR, value, index, NULL, 0, 1000);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "Failed to send mode control message %x.%x: err=%d.\n", pr_err("Failed to send mode control message %x.%x: err=%d.\n",
value, index, err); value, index, err);
return err; return err;
} }
@ -236,7 +236,7 @@ static int ds_send_control(struct ds_device *dev, u16 value, u16 index)
err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, dev->ep[EP_CONTROL]), err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, dev->ep[EP_CONTROL]),
COMM_CMD, VENDOR, value, index, NULL, 0, 1000); COMM_CMD, VENDOR, value, index, NULL, 0, 1000);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "Failed to send control message %x.%x: err=%d.\n", pr_err("Failed to send control message %x.%x: err=%d.\n",
value, index, err); value, index, err);
return err; return err;
} }
@ -255,7 +255,8 @@ static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st,
err = usb_interrupt_msg(dev->udev, usb_rcvintpipe(dev->udev, err = usb_interrupt_msg(dev->udev, usb_rcvintpipe(dev->udev,
dev->ep[EP_STATUS]), buf, size, &count, 100); dev->ep[EP_STATUS]), buf, size, &count, 100);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "Failed to read 1-wire data from 0x%x: err=%d.\n", dev->ep[EP_STATUS], err); pr_err("Failed to read 1-wire data from 0x%x: err=%d.\n",
dev->ep[EP_STATUS], err);
return err; return err;
} }
@ -267,17 +268,17 @@ static int ds_recv_status_nodump(struct ds_device *dev, struct ds_status *st,
static inline void ds_print_msg(unsigned char *buf, unsigned char *str, int off) static inline void ds_print_msg(unsigned char *buf, unsigned char *str, int off)
{ {
printk(KERN_INFO "%45s: %8x\n", str, buf[off]); pr_info("%45s: %8x\n", str, buf[off]);
} }
static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count) static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count)
{ {
int i; int i;
printk(KERN_INFO "0x%x: count=%d, status: ", dev->ep[EP_STATUS], count); pr_info("0x%x: count=%d, status: ", dev->ep[EP_STATUS], count);
for (i=0; i<count; ++i) for (i=0; i<count; ++i)
printk("%02x ", buf[i]); pr_info("%02x ", buf[i]);
printk(KERN_INFO "\n"); pr_info("\n");
if (count >= 16) { if (count >= 16) {
ds_print_msg(buf, "enable flag", 0); ds_print_msg(buf, "enable flag", 0);
@ -305,21 +306,21 @@ static void ds_dump_status(struct ds_device *dev, unsigned char *buf, int count)
} }
ds_print_msg(buf, "Result Register Value: ", i); ds_print_msg(buf, "Result Register Value: ", i);
if (buf[i] & RR_NRS) if (buf[i] & RR_NRS)
printk(KERN_INFO "NRS: Reset no presence or ...\n"); pr_info("NRS: Reset no presence or ...\n");
if (buf[i] & RR_SH) if (buf[i] & RR_SH)
printk(KERN_INFO "SH: short on reset or set path\n"); pr_info("SH: short on reset or set path\n");
if (buf[i] & RR_APP) if (buf[i] & RR_APP)
printk(KERN_INFO "APP: alarming presence on reset\n"); pr_info("APP: alarming presence on reset\n");
if (buf[i] & RR_VPP) if (buf[i] & RR_VPP)
printk(KERN_INFO "VPP: 12V expected not seen\n"); pr_info("VPP: 12V expected not seen\n");
if (buf[i] & RR_CMP) if (buf[i] & RR_CMP)
printk(KERN_INFO "CMP: compare error\n"); pr_info("CMP: compare error\n");
if (buf[i] & RR_CRC) if (buf[i] & RR_CRC)
printk(KERN_INFO "CRC: CRC error detected\n"); pr_info("CRC: CRC error detected\n");
if (buf[i] & RR_RDP) if (buf[i] & RR_RDP)
printk(KERN_INFO "RDP: redirected page\n"); pr_info("RDP: redirected page\n");
if (buf[i] & RR_EOS) if (buf[i] & RR_EOS)
printk(KERN_INFO "EOS: end of search error\n"); pr_info("EOS: end of search error\n");
} }
} }
@ -330,15 +331,13 @@ static void ds_reset_device(struct ds_device *dev)
* the strong pullup. * the strong pullup.
*/ */
if (ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE)) if (ds_send_control_mode(dev, MOD_PULSE_EN, PULSE_SPUE))
printk(KERN_ERR "ds_reset_device: " pr_err("ds_reset_device: Error allowing strong pullup\n");
"Error allowing strong pullup\n");
/* Chip strong pullup time was cleared. */ /* Chip strong pullup time was cleared. */
if (dev->spu_sleep) { if (dev->spu_sleep) {
/* lower 4 bits are 0, see ds_set_pullup */ /* lower 4 bits are 0, see ds_set_pullup */
u8 del = dev->spu_sleep>>4; u8 del = dev->spu_sleep>>4;
if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del)) if (ds_send_control(dev, COMM_SET_DURATION | COMM_IM, del))
printk(KERN_ERR "ds_reset_device: " pr_err("ds_reset_device: Error setting duration\n");
"Error setting duration\n");
} }
} }
@ -363,7 +362,7 @@ static int ds_recv_data(struct ds_device *dev, unsigned char *buf, int size)
u8 buf[ST_SIZE]; u8 buf[ST_SIZE];
int count; int count;
printk(KERN_INFO "Clearing ep0x%x.\n", dev->ep[EP_DATA_IN]); pr_info("Clearing ep0x%x.\n", dev->ep[EP_DATA_IN]);
usb_clear_halt(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_DATA_IN])); usb_clear_halt(dev->udev, usb_rcvbulkpipe(dev->udev, dev->ep[EP_DATA_IN]));
count = ds_recv_status_nodump(dev, &st, buf, sizeof(buf)); count = ds_recv_status_nodump(dev, &st, buf, sizeof(buf));
@ -391,7 +390,7 @@ static int ds_send_data(struct ds_device *dev, unsigned char *buf, int len)
count = 0; count = 0;
err = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, dev->ep[EP_DATA_OUT]), buf, len, &count, 1000); err = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, dev->ep[EP_DATA_OUT]), buf, len, &count, 1000);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "Failed to write 1-wire data to ep0x%x: " pr_err("Failed to write 1-wire data to ep0x%x: "
"err=%d.\n", dev->ep[EP_DATA_OUT], err); "err=%d.\n", dev->ep[EP_DATA_OUT], err);
return err; return err;
} }
@ -475,7 +474,7 @@ static int ds_wait_status(struct ds_device *dev, struct ds_status *st)
} while (!(st->status & ST_IDLE) && !(err < 0) && ++count < 100); } while (!(st->status & ST_IDLE) && !(err < 0) && ++count < 100);
if (err >= 16 && st->status & ST_EPOF) { if (err >= 16 && st->status & ST_EPOF) {
printk(KERN_INFO "Resetting device after ST_EPOF.\n"); pr_info("Resetting device after ST_EPOF.\n");
ds_reset_device(dev); ds_reset_device(dev);
/* Always dump the device status. */ /* Always dump the device status. */
count = 101; count = 101;
@ -992,7 +991,7 @@ static int ds_probe(struct usb_interface *intf,
dev = kzalloc(sizeof(struct ds_device), GFP_KERNEL); dev = kzalloc(sizeof(struct ds_device), GFP_KERNEL);
if (!dev) { if (!dev) {
printk(KERN_INFO "Failed to allocate new DS9490R structure.\n"); pr_info("Failed to allocate new DS9490R structure.\n");
return -ENOMEM; return -ENOMEM;
} }
dev->udev = usb_get_dev(udev); dev->udev = usb_get_dev(udev);
@ -1024,7 +1023,8 @@ static int ds_probe(struct usb_interface *intf,
iface_desc = &intf->altsetting[alt]; iface_desc = &intf->altsetting[alt];
if (iface_desc->desc.bNumEndpoints != NUM_EP-1) { if (iface_desc->desc.bNumEndpoints != NUM_EP-1) {
printk(KERN_INFO "Num endpoints=%d. It is not DS9490R.\n", iface_desc->desc.bNumEndpoints); pr_info("Num endpoints=%d. It is not DS9490R.\n",
iface_desc->desc.bNumEndpoints);
err = -EINVAL; err = -EINVAL;
goto err_out_clear; goto err_out_clear;
} }