* [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c
@ 2012-10-05 0:07 YAMANE Toshiaki
2012-10-05 9:08 ` Ian Abbott
2012-10-06 5:31 ` YAMANE Toshiaki
0 siblings, 2 replies; 4+ messages in thread
From: YAMANE Toshiaki @ 2012-10-05 0:07 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Ian Abbott, Frank Mori Hess, linux-kernel, YAMANE Toshiaki
fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
- WARNING: quoted string split across lines
Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
---
drivers/staging/comedi/drivers/me_daq.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 2ce0b14..0d85729 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -384,8 +384,8 @@ static int me_ai_insn_read(struct comedi_device *dev,
(readw(dev_private->me_regbase +
ME_READ_AD_FIFO) ^ 0x800) & 0x0FFF;
} else {
- printk(KERN_ERR "comedi%d: Cannot get single value\n",
- dev->minor);
+ dev_err(dev->class_dev, "comedi%d: Cannot get single value\n",
+ dev->minor);
return -EIO;
}
@@ -566,8 +566,8 @@ static int me2600_xilinx_download(struct comedi_device *dev,
if (value & 0x20) {
/* Disable interrupt */
writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
- printk(KERN_ERR "comedi%d: Xilinx download failed\n",
- dev->minor);
+ dev_err(dev->class_dev, "comedi%d: Xilinx download failed\n",
+ dev->minor);
return -EIO;
}
@@ -654,8 +654,9 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
/* Enable PCI device and request PCI regions */
if (comedi_pci_enable(pcidev, dev->board_name) < 0) {
- printk(KERN_ERR "comedi%d: Failed to enable PCI device and "
- "request regions\n", dev->minor);
+ dev_err(dev->class_dev,
+ "comedi%d: Failed to enable PCI device and request regions\n",
+ dev->minor);
return -EIO;
}
@@ -666,7 +667,8 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
ioremap(plx_regbase_tmp, plx_regbase_size_tmp);
dev_private->plx_regbase_size = plx_regbase_size_tmp;
if (!dev_private->plx_regbase) {
- printk("comedi%d: Failed to remap I/O memory\n", dev->minor);
+ dev_err(dev->class_dev,
+ "comedi%d: Failed to remap I/O memory\n", dev->minor);
return -ENOMEM;
}
@@ -676,11 +678,13 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
swap_regbase_size_tmp = pci_resource_len(pcidev, 5);
if (!swap_regbase_tmp)
- printk(KERN_ERR "comedi%d: Swap not present\n", dev->minor);
+ dev_err(dev->class_dev,
+ "comedi%d: Swap not present\n", dev->minor);
/*---------------------------------------------- Workaround start ---*/
if (plx_regbase_tmp & 0x0080) {
- printk(KERN_ERR "comedi%d: PLX-Bug detected\n", dev->minor);
+ dev_err(dev->class_dev,
+ "comedi%d: PLX-Bug detected\n", dev->minor);
if (swap_regbase_tmp) {
regbase_tmp = plx_regbase_tmp;
@@ -716,8 +720,8 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
dev_private->me_regbase_size = me_regbase_size_tmp;
dev_private->me_regbase = ioremap(me_regbase_tmp, me_regbase_size_tmp);
if (!dev_private->me_regbase) {
- printk(KERN_ERR "comedi%d: Failed to remap I/O memory\n",
- dev->minor);
+ dev_err(dev->class_dev,
+ "comedi%d: Failed to remap I/O memory\n", dev->minor);
return -ENOMEM;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c
2012-10-05 0:07 [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c YAMANE Toshiaki
@ 2012-10-05 9:08 ` Ian Abbott
2012-10-05 9:34 ` Toshiaki Yamane
2012-10-06 5:31 ` YAMANE Toshiaki
1 sibling, 1 reply; 4+ messages in thread
From: Ian Abbott @ 2012-10-05 9:08 UTC (permalink / raw)
To: YAMANE Toshiaki
Cc: Greg Kroah-Hartman, Ian Abbott, Frank Mori Hess, linux-kernel
On 2012-10-05 01:07, YAMANE Toshiaki wrote:
> fixed below checkpatch warnings.
> - WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
> - WARNING: quoted string split across lines
>
> Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
> ---
> drivers/staging/comedi/drivers/me_daq.c | 26 +++++++++++++++-----------
> 1 file changed, 15 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
> index 2ce0b14..0d85729 100644
> --- a/drivers/staging/comedi/drivers/me_daq.c
> +++ b/drivers/staging/comedi/drivers/me_daq.c
> @@ -384,8 +384,8 @@ static int me_ai_insn_read(struct comedi_device *dev,
> (readw(dev_private->me_regbase +
> ME_READ_AD_FIFO) ^ 0x800) & 0x0FFF;
> } else {
> - printk(KERN_ERR "comedi%d: Cannot get single value\n",
> - dev->minor);
> + dev_err(dev->class_dev, "comedi%d: Cannot get single value\n",
> + dev->minor);
There is no need for the "comedi%d: " prefix as dev_??? already puts the
device name in the message. Just use:
dev_err(dev->class_dev, "Cannot get single value\n");
> return -EIO;
> }
>
> @@ -566,8 +566,8 @@ static int me2600_xilinx_download(struct comedi_device *dev,
> if (value & 0x20) {
> /* Disable interrupt */
> writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
> - printk(KERN_ERR "comedi%d: Xilinx download failed\n",
> - dev->minor);
> + dev_err(dev->class_dev, "comedi%d: Xilinx download failed\n",
> + dev->minor);
> return -EIO;
> }
>
> @@ -654,8 +654,9 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
>
> /* Enable PCI device and request PCI regions */
> if (comedi_pci_enable(pcidev, dev->board_name) < 0) {
> - printk(KERN_ERR "comedi%d: Failed to enable PCI device and "
> - "request regions\n", dev->minor);
> + dev_err(dev->class_dev,
> + "comedi%d: Failed to enable PCI device and request regions\n",
> + dev->minor);
> return -EIO;
> }
>
> @@ -666,7 +667,8 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
> ioremap(plx_regbase_tmp, plx_regbase_size_tmp);
> dev_private->plx_regbase_size = plx_regbase_size_tmp;
> if (!dev_private->plx_regbase) {
> - printk("comedi%d: Failed to remap I/O memory\n", dev->minor);
> + dev_err(dev->class_dev,
> + "comedi%d: Failed to remap I/O memory\n", dev->minor);
> return -ENOMEM;
> }
>
> @@ -676,11 +678,13 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
> swap_regbase_size_tmp = pci_resource_len(pcidev, 5);
>
> if (!swap_regbase_tmp)
> - printk(KERN_ERR "comedi%d: Swap not present\n", dev->minor);
> + dev_err(dev->class_dev,
> + "comedi%d: Swap not present\n", dev->minor);
>
> /*---------------------------------------------- Workaround start ---*/
> if (plx_regbase_tmp & 0x0080) {
> - printk(KERN_ERR "comedi%d: PLX-Bug detected\n", dev->minor);
> + dev_err(dev->class_dev,
> + "comedi%d: PLX-Bug detected\n", dev->minor);
>
> if (swap_regbase_tmp) {
> regbase_tmp = plx_regbase_tmp;
> @@ -716,8 +720,8 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
> dev_private->me_regbase_size = me_regbase_size_tmp;
> dev_private->me_regbase = ioremap(me_regbase_tmp, me_regbase_size_tmp);
> if (!dev_private->me_regbase) {
> - printk(KERN_ERR "comedi%d: Failed to remap I/O memory\n",
> - dev->minor);
> + dev_err(dev->class_dev,
> + "comedi%d: Failed to remap I/O memory\n", dev->minor);
> return -ENOMEM;
> }
And the same sort of thing for all of those.
--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c
2012-10-05 9:08 ` Ian Abbott
@ 2012-10-05 9:34 ` Toshiaki Yamane
0 siblings, 0 replies; 4+ messages in thread
From: Toshiaki Yamane @ 2012-10-05 9:34 UTC (permalink / raw)
To: Ian Abbott; +Cc: Greg Kroah-Hartman, Ian Abbott, Frank Mori Hess, linux-kernel
On Fri, Oct 5, 2012 at 6:08 PM, Ian Abbott <abbotti@mev.co.uk> wrote:
> On 2012-10-05 01:07, YAMANE Toshiaki wrote:
>>
>> fixed below checkpatch warnings.
>> - WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then
>> pr_err(... to printk(KERN_ERR ...
>> - WARNING: quoted string split across lines
>>
>> Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
>> ---
>> drivers/staging/comedi/drivers/me_daq.c | 26
>> +++++++++++++++-----------
>> 1 file changed, 15 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/staging/comedi/drivers/me_daq.c
>> b/drivers/staging/comedi/drivers/me_daq.c
>> index 2ce0b14..0d85729 100644
>> --- a/drivers/staging/comedi/drivers/me_daq.c
>> +++ b/drivers/staging/comedi/drivers/me_daq.c
>> @@ -384,8 +384,8 @@ static int me_ai_insn_read(struct comedi_device *dev,
>> (readw(dev_private->me_regbase +
>> ME_READ_AD_FIFO) ^ 0x800) & 0x0FFF;
>> } else {
>> - printk(KERN_ERR "comedi%d: Cannot get single value\n",
>> - dev->minor);
>> + dev_err(dev->class_dev, "comedi%d: Cannot get single
>> value\n",
>> + dev->minor);
>
>
> There is no need for the "comedi%d: " prefix as dev_??? already puts the
> device name in the message. Just use:
>
> dev_err(dev->class_dev, "Cannot get single value\n");
>
>
>> return -EIO;
>> }
>>
>> @@ -566,8 +566,8 @@ static int me2600_xilinx_download(struct comedi_device
>> *dev,
>> if (value & 0x20) {
>> /* Disable interrupt */
>> writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
>> - printk(KERN_ERR "comedi%d: Xilinx download failed\n",
>> - dev->minor);
>> + dev_err(dev->class_dev, "comedi%d: Xilinx download
>> failed\n",
>> + dev->minor);
>> return -EIO;
>> }
>>
>> @@ -654,8 +654,9 @@ static int me_attach_pci(struct comedi_device *dev,
>> struct pci_dev *pcidev)
>>
>> /* Enable PCI device and request PCI regions */
>> if (comedi_pci_enable(pcidev, dev->board_name) < 0) {
>> - printk(KERN_ERR "comedi%d: Failed to enable PCI device and
>> "
>> - "request regions\n", dev->minor);
>> + dev_err(dev->class_dev,
>> + "comedi%d: Failed to enable PCI device and request
>> regions\n",
>> + dev->minor);
>> return -EIO;
>> }
>>
>> @@ -666,7 +667,8 @@ static int me_attach_pci(struct comedi_device *dev,
>> struct pci_dev *pcidev)
>> ioremap(plx_regbase_tmp, plx_regbase_size_tmp);
>> dev_private->plx_regbase_size = plx_regbase_size_tmp;
>> if (!dev_private->plx_regbase) {
>> - printk("comedi%d: Failed to remap I/O memory\n",
>> dev->minor);
>> + dev_err(dev->class_dev,
>> + "comedi%d: Failed to remap I/O memory\n",
>> dev->minor);
>> return -ENOMEM;
>> }
>>
>> @@ -676,11 +678,13 @@ static int me_attach_pci(struct comedi_device *dev,
>> struct pci_dev *pcidev)
>> swap_regbase_size_tmp = pci_resource_len(pcidev, 5);
>>
>> if (!swap_regbase_tmp)
>> - printk(KERN_ERR "comedi%d: Swap not present\n",
>> dev->minor);
>> + dev_err(dev->class_dev,
>> + "comedi%d: Swap not present\n", dev->minor);
>>
>> /*---------------------------------------------- Workaround start
>> ---*/
>> if (plx_regbase_tmp & 0x0080) {
>> - printk(KERN_ERR "comedi%d: PLX-Bug detected\n",
>> dev->minor);
>> + dev_err(dev->class_dev,
>> + "comedi%d: PLX-Bug detected\n", dev->minor);
>>
>> if (swap_regbase_tmp) {
>> regbase_tmp = plx_regbase_tmp;
>> @@ -716,8 +720,8 @@ static int me_attach_pci(struct comedi_device *dev,
>> struct pci_dev *pcidev)
>> dev_private->me_regbase_size = me_regbase_size_tmp;
>> dev_private->me_regbase = ioremap(me_regbase_tmp,
>> me_regbase_size_tmp);
>> if (!dev_private->me_regbase) {
>> - printk(KERN_ERR "comedi%d: Failed to remap I/O memory\n",
>> - dev->minor);
>> + dev_err(dev->class_dev,
>> + "comedi%d: Failed to remap I/O memory\n",
>> dev->minor);
>> return -ENOMEM;
>> }
>
>
> And the same sort of thing for all of those.
Ian-san,
Thank you for pointing out my mistakes.
I will try to fix it.
--
Regards,
YAMANE Toshiaki
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c
2012-10-05 0:07 [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c YAMANE Toshiaki
2012-10-05 9:08 ` Ian Abbott
@ 2012-10-06 5:31 ` YAMANE Toshiaki
1 sibling, 0 replies; 4+ messages in thread
From: YAMANE Toshiaki @ 2012-10-06 5:31 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Ian Abbott, Frank Mori Hess, linux-kernel, YAMANE Toshiaki
fixed below checkpatch warnings.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
- WARNING: quoted string split across lines
Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com>
---
drivers/staging/comedi/drivers/me_daq.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 2ce0b14..6a468c1 100644
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -384,8 +384,7 @@ static int me_ai_insn_read(struct comedi_device *dev,
(readw(dev_private->me_regbase +
ME_READ_AD_FIFO) ^ 0x800) & 0x0FFF;
} else {
- printk(KERN_ERR "comedi%d: Cannot get single value\n",
- dev->minor);
+ dev_err(dev->class_dev, "Cannot get single value\n");
return -EIO;
}
@@ -566,8 +565,7 @@ static int me2600_xilinx_download(struct comedi_device *dev,
if (value & 0x20) {
/* Disable interrupt */
writel(0x00, dev_private->plx_regbase + PLX_INTCSR);
- printk(KERN_ERR "comedi%d: Xilinx download failed\n",
- dev->minor);
+ dev_err(dev->class_dev, "Xilinx download failed\n");
return -EIO;
}
@@ -654,8 +652,8 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
/* Enable PCI device and request PCI regions */
if (comedi_pci_enable(pcidev, dev->board_name) < 0) {
- printk(KERN_ERR "comedi%d: Failed to enable PCI device and "
- "request regions\n", dev->minor);
+ dev_err(dev->class_dev,
+ "Failed to enable PCI device and request regions\n");
return -EIO;
}
@@ -666,7 +664,7 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
ioremap(plx_regbase_tmp, plx_regbase_size_tmp);
dev_private->plx_regbase_size = plx_regbase_size_tmp;
if (!dev_private->plx_regbase) {
- printk("comedi%d: Failed to remap I/O memory\n", dev->minor);
+ dev_err(dev->class_dev, "Failed to remap I/O memory\n");
return -ENOMEM;
}
@@ -676,11 +674,11 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
swap_regbase_size_tmp = pci_resource_len(pcidev, 5);
if (!swap_regbase_tmp)
- printk(KERN_ERR "comedi%d: Swap not present\n", dev->minor);
+ dev_err(dev->class_dev, "Swap not present\n");
/*---------------------------------------------- Workaround start ---*/
if (plx_regbase_tmp & 0x0080) {
- printk(KERN_ERR "comedi%d: PLX-Bug detected\n", dev->minor);
+ dev_err(dev->class_dev, "PLX-Bug detected\n");
if (swap_regbase_tmp) {
regbase_tmp = plx_regbase_tmp;
@@ -716,8 +714,7 @@ static int me_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev)
dev_private->me_regbase_size = me_regbase_size_tmp;
dev_private->me_regbase = ioremap(me_regbase_tmp, me_regbase_size_tmp);
if (!dev_private->me_regbase) {
- printk(KERN_ERR "comedi%d: Failed to remap I/O memory\n",
- dev->minor);
+ dev_err(dev->class_dev, "Failed to remap I/O memory\n");
return -ENOMEM;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-06 5:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-05 0:07 [PATCH] staging/comedi: Use dev_ printks in drivers/me_daq.c YAMANE Toshiaki
2012-10-05 9:08 ` Ian Abbott
2012-10-05 9:34 ` Toshiaki Yamane
2012-10-06 5:31 ` YAMANE Toshiaki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).