Re: [PATCH] Add missing newlines to some uses of dev_ messages
On Saturday 11 August 2007, Jean Delvare wrote: > Note that there are 3 more messages to fix in > drivers/i2c/chips/menelaus.c (3 calls to pr_err.) I'd hope those will get fixed by final versions of the patches I've seen floating around definining a standard pr_err() ... not fixing them here allows the two patches to not conflict. :) - Dave - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
Hi Joe,
On Tue, 07 Aug 2007 18:09:39 -0700, Joe Perches wrote:
> Found these while looking at printk uses.
>
> Add missing newlines to dev_ uses
> Add missing KERN_ prefixes to multiline dev_s
> Fixed a wierd->weird spelling typo
> Added a newline to a printk
Thanks for doing this.
> diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
> index 17cecf1..be99c02 100644
> --- a/drivers/i2c/busses/i2c-pmcmsp.c
> +++ b/drivers/i2c/busses/i2c-pmcmsp.c
> @@ -591,18 +591,18 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter
> *adap,
> if (msg->flags & I2C_M_TEN)
> pmcmsptwi_set_twi_config(, data);
>
> - dev_dbg(>dev, "I2C %s of %d bytes ",
> - (msg->flags & I2C_M_RD) ? "read" : "write", msg->len);
> + dev_dbg(>dev, "I2C %s of %d bytes %s\n",
> + (msg->flags & I2C_M_RD) ? "read" : "write", msg->len,
> + (ret == MSP_TWI_XFER_OK) ? "succeeded" : "failed");
> +
> if (ret != MSP_TWI_XFER_OK) {
> /*
>* TODO: We could potentially loop and retry in the case
>* of MSP_TWI_XFER_TIMEOUT.
>*/
> - dev_dbg(>dev, "failed\n");
> return -1;
> }
>
> - dev_dbg(>dev, "succeeded\n");
> return 0;
> }
>
> diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
> index 17376fe..f8d0dff 100644
> --- a/drivers/i2c/busses/i2c-pnx.c
> +++ b/drivers/i2c/busses/i2c-pnx.c
> @@ -575,7 +575,7 @@ static int __devinit i2c_pnx_probe(struct platform_device
> *pdev)
> else {
> freq_mhz = PNX_DEFAULT_FREQ;
> dev_info(>dev, "Setting bus frequency to default value: "
> -"%d MHz", freq_mhz);
> +"%d MHz\n", freq_mhz);
> }
>
> i2c_pnx->adapter->algo = _algorithm;
> diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
> index 48a7e2f..76d4eda 100644
> --- a/drivers/i2c/chips/menelaus.c
> +++ b/drivers/i2c/chips/menelaus.c
> @@ -1198,7 +1198,7 @@ static int menelaus_probe(struct i2c_client *client)
> err = request_irq(client->irq, menelaus_irq, IRQF_DISABLED,
> DRIVER_NAME, menelaus);
> if (err) {
> - dev_dbg(>dev, "can't get IRQ %d, err %d",
> + dev_dbg(>dev, "can't get IRQ %d, err %d\n",
> client->irq, err);
> goto fail1;
> }
drivers/i2c parts reviewed and
Acked-by: Jean Delvare <[EMAIL PROTECTED]>
Note that there are 3 more messages to fix in
drivers/i2c/chips/menelaus.c (3 calls to pr_err.)
--
Jean Delvare
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
Hi Nish, On Tue, 7 Aug 2007 20:00:24 -0700, Nish Aravamudan wrote: > On 8/7/07, Joe Perches <[EMAIL PROTECTED]> wrote: > > Found these while looking at printk uses. > > > > Add missing newlines to dev_ uses > > Add missing KERN_ prefixes to multiline dev_s > > Fixed a wierd->weird spelling typo > > Added a newline to a printk > > I think these should have been split logically into 4 groups of > patches (except perhaps where they touched the same file for the first > two and the last). Not worth splitting IMHO, these are all misuses of printk. > The third type should go through trivial. Except for this one, which really doesn't belong to this patch, granted. > And they should have been split logically by subsystem, most likely? Depends. If Andrew is going to pick the patch quickly and apply it, then it's fine (except that I see that Andrew wasn't Cc'd, so it's unlikely to happen.) But if Andrew doesn't want to take this patch, then indeed, the only way to get it applied is to split it by subsystem. > > > > > diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c > > index e58fcad..a5df672 100644 > > --- a/arch/ia64/sn/kernel/xpnet.c > > +++ b/arch/ia64/sn/kernel/xpnet.c > > @@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct > > xpnet_message *msg) > > skb->protocol = eth_type_trans(skb, xpnet_device); > > skb->ip_summed = CHECKSUM_UNNECESSARY; > > > > - dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p " > > - "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n", > > + dev_dbg(xpnet, "passing skb to network layer\n" > > + KERN_DEBUG "\tskb->head=0x%p skb->data=0x%p skb->tail=0x%p " > > + "skb->end=0x%p skb->len=%d\n", > > (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb), > > skb_end_pointer(skb), skb->len); > > > > I'm not a maintainer of any code by any means, but it seems odd, > redundant and visually confusing to me to use the dev_dbg() function > and have KERN_DEBUG's inside the string -- makes me question every > time why there isn't one for the first line too. The code above looks correct to me. > Perhaps these multi-line debug statements should simply be split into > multiple dev_dbg() calls? Similar for the other dev_ functions. I > think it might look cleaner, at least. Just my two cents, not a NAK or > anything. The benefit of having a single call is that other calls to printk() won't be interlaced with our message. This has been discussed lately in a different thread. So you may think that the code above is confusing, but it is currently the best way to ensure that related lines stay grouped in the kernel log. -- Jean Delvare - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
Joe Perches napsal(a): > Found these while looking at printk uses. > > Add missing newlines to dev_ uses > Add missing KERN_ prefixes to multiline dev_s > Fixed a wierd->weird spelling typo > Added a newline to a printk > > Signed-off-by: Joe Perches <[EMAIL PROTECTED]> > drivers/char/isicom.c | 10 ++-- Acked-by: Jiri Slaby <[EMAIL PROTECTED]> -- Jiri Slaby ([EMAIL PROTECTED]) Faculty of Informatics, Masaryk University - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
Splitting by subsystem *would* have been better ... On Tuesday 07 August 2007, Joe Perches wrote: > drivers/i2c/chips/menelaus.c | 2 +- ok ... > drivers/net/usb/mcs7830.c | 16 +++--- ... ok ... > drivers/rtc/rtc-sysfs.c | 5 +-- ... ok ... > drivers/spi/atmel_spi.c | 2 +- > drivers/spi/spi_bfin5xx.c | 2 +- > drivers/spi/spi_imx.c | 4 +- ... ok ... > drivers/usb/class/cdc-acm.c | 34 > > drivers/usb/core/endpoint.c | 2 +- > drivers/usb/core/message.c | 4 +- > drivers/usb/host/ohci-s3c2410.c | 2 +- > drivers/usb/misc/adutux.c | 4 +- > drivers/usb/misc/iowarrior.c | 8 +++--- > drivers/usb/misc/phidgetmotorcontrol.c | 2 +- > drivers/usb/serial/ftdi_sio.c | 4 +- > drivers/usb/serial/io_edgeport.c | 2 +- > drivers/usb/serial/ipw.c | 18 > drivers/usb/serial/mos7720.c | 4 +- > drivers/usb/serial/oti6858.c | 2 +- > drivers/usb/serial/sierra.c | 10 ... ok ... ACK. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
* Joe Perches <[EMAIL PROTECTED]> [2007-08-07 18:09:39 -0700]: > Found these while looking at printk uses. > > Add missing newlines to dev_ uses > Add missing KERN_ prefixes to multiline dev_s > Fixed a wierd->weird spelling typo > Added a newline to a printk > > Signed-off-by: Joe Perches <[EMAIL PROTECTED]> Looks good. > drivers/hwmon/adm1026.c|2 +- > drivers/hwmon/lm63.c |2 +- > drivers/hwmon/vt1211.c |2 +- > drivers/hwmon/w83791d.c|2 +- > drivers/hwmon/w83792d.c|4 +- Acked-by: Mark M. Hoffman <[EMAIL PROTECTED]> Regards, -- Mark M. Hoffman [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
On 8/7/07, Joe Perches <[EMAIL PROTECTED]> wrote: > Found these while looking at printk uses. > > Add missing newlines to dev_ uses > Add missing KERN_ prefixes to multiline dev_s > Fixed a wierd->weird spelling typo > Added a newline to a printk I think these should have been split logically into 4 groups of patches (except perhaps where they touched the same file for the first two and the last). The third type should go through trivial. And they should have been split logically by subsystem, most likely? > diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c > index e58fcad..a5df672 100644 > --- a/arch/ia64/sn/kernel/xpnet.c > +++ b/arch/ia64/sn/kernel/xpnet.c > @@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct > xpnet_message *msg) > skb->protocol = eth_type_trans(skb, xpnet_device); > skb->ip_summed = CHECKSUM_UNNECESSARY; > > - dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p " > - "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n", > + dev_dbg(xpnet, "passing skb to network layer\n" > + KERN_DEBUG "\tskb->head=0x%p skb->data=0x%p skb->tail=0x%p " > + "skb->end=0x%p skb->len=%d\n", > (void *)skb->head, (void *)skb->data, skb_tail_pointer(skb), > skb_end_pointer(skb), skb->len); I'm not a maintainer of any code by any means, but it seems odd, redundant and visually confusing to me to use the dev_dbg() function and have KERN_DEBUG's inside the string -- makes me question every time why there isn't one for the first line too. Perhaps these multi-line debug statements should simply be split into multiple dev_dbg() calls? Similar for the other dev_ functions. I think it might look cleaner, at least. Just my two cents, not a NAK or anything. Thanks, Nish - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
James Smart wrote: ACK -- james s Joe Perches wrote: [...] Standard email etiquette: please don't quote the entirety of a 1200+ line patch, just for a one-line response. (also, top posting should be avoided as well) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] Add missing newlines to some uses of dev_ messages
ACK
-- james s
Joe Perches wrote:
Found these while looking at printk uses.
Add missing newlines to dev_ uses
Add missing KERN_ prefixes to multiline dev_s
Fixed a wierd->weird spelling typo
Added a newline to a printk
Signed-off-by: Joe Perches <[EMAIL PROTECTED]>
arch/ia64/sn/kernel/xpnet.c| 13 ++-
drivers/block/xsysace.c|4 +-
drivers/char/isicom.c | 10 ++--
drivers/hwmon/adm1026.c|2 +-
drivers/hwmon/lm63.c |2 +-
drivers/hwmon/vt1211.c |2 +-
drivers/hwmon/w83791d.c|2 +-
drivers/hwmon/w83792d.c|4 +-
drivers/i2c/busses/i2c-pmcmsp.c|8 +++---
drivers/i2c/busses/i2c-pnx.c |2 +-
drivers/i2c/chips/menelaus.c |2 +-
drivers/infiniband/hw/ehca/ehca_main.c |4 +-
drivers/isdn/gigaset/common.c |3 +-
drivers/mtd/nand/s3c2410.c |2 +-
drivers/net/ax88796.c |2 +-
drivers/net/bnx2.c |2 +-
drivers/net/ehea/ehea_main.c |9 ---
drivers/net/myri10ge/myri10ge.c|3 +-
drivers/net/sky2.c |2 +-
drivers/net/usb/mcs7830.c | 16 +++---
drivers/net/xen-netfront.c |2 +-
drivers/power/ds2760_battery.c |2 +-
drivers/ps3/ps3stor_lib.c |2 +-
drivers/rtc/rtc-sysfs.c|5 +--
drivers/scsi/lpfc/lpfc_sli.c |8 --
drivers/scsi/qla4xxx/ql4_os.c |2 +-
drivers/spi/atmel_spi.c|2 +-
drivers/spi/spi_bfin5xx.c |2 +-
drivers/spi/spi_imx.c |4 +-
drivers/usb/class/cdc-acm.c| 34
drivers/usb/core/endpoint.c|2 +-
drivers/usb/core/message.c |4 +-
drivers/usb/host/ohci-s3c2410.c|2 +-
drivers/usb/misc/adutux.c |4 +-
drivers/usb/misc/iowarrior.c |8 +++---
drivers/usb/misc/phidgetmotorcontrol.c |2 +-
drivers/usb/serial/ftdi_sio.c |4 +-
drivers/usb/serial/io_edgeport.c |2 +-
drivers/usb/serial/ipw.c | 18
drivers/usb/serial/mos7720.c |4 +-
drivers/usb/serial/oti6858.c |2 +-
drivers/usb/serial/sierra.c| 10
drivers/video/gxt4500.c|2 +-
drivers/video/omap/blizzard.c |2 +-
drivers/video/omap/dispc.c |6 ++--
drivers/video/omap/hwa742.c|2 +-
drivers/video/omap/rfbi.c |4 +-
drivers/video/s3c2410fb.c |2 +-
drivers/w1/masters/ds1wm.c |2 +-
drivers/xen/xenbus/xenbus_probe.c |5 ++-
sound/arm/aaci.c |4 +-
51 files changed, 129 insertions(+), 119 deletions(-)
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index e58fcad..a5df672 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct
xpnet_message *msg)
skb->protocol = eth_type_trans(skb, xpnet_device);
skb->ip_summed = CHECKSUM_UNNECESSARY;
- dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p "
- "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n",
+ dev_dbg(xpnet, "passing skb to network layer\n"
+ KERN_DEBUG "\tskb->head=0x%p skb->data=0x%p skb->tail=0x%p "
+ "skb->end=0x%p skb->len=%d\n",
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
skb_end_pointer(skb), skb->len);
@@ -576,10 +577,10 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
msg->buf_pa = __pa(start_addr);
- dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa="
- "0x%lx, msg->size=%u, msg->leadin_ignore=%u, "
- "msg->tailout_ignore=%u\n", dest_partid,
- XPC_NET_CHANNEL, msg->buf_pa, msg->size,
+ dev_dbg(xpnet, "sending XPC message to %d:%d\n"
+ KERN_DEBUG "msg->buf_pa=0x%lx, msg->size=%u, "
+ "msg->leadin_ignore=%u, msg->tailout_ignore=%u\n",
+ dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
msg->leadin_ignore, msg->tailout_ignore);
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index cb27e88..e988710 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -383,8 +383,8 @@ static inline void ace_dump_mem(void *base, int len)
static void ace_dump_regs(struct ace_device *ace)
{
dev_info(ace->dev, "ctrl: %.8x seccnt/cmd: %.4x
[PATCH] Add missing newlines to some uses of dev_ messages
Found these while looking at printk uses.
Add missing newlines to dev_ uses
Add missing KERN_ prefixes to multiline dev_s
Fixed a wierd->weird spelling typo
Added a newline to a printk
Signed-off-by: Joe Perches <[EMAIL PROTECTED]>
arch/ia64/sn/kernel/xpnet.c| 13 ++-
drivers/block/xsysace.c|4 +-
drivers/char/isicom.c | 10 ++--
drivers/hwmon/adm1026.c|2 +-
drivers/hwmon/lm63.c |2 +-
drivers/hwmon/vt1211.c |2 +-
drivers/hwmon/w83791d.c|2 +-
drivers/hwmon/w83792d.c|4 +-
drivers/i2c/busses/i2c-pmcmsp.c|8 +++---
drivers/i2c/busses/i2c-pnx.c |2 +-
drivers/i2c/chips/menelaus.c |2 +-
drivers/infiniband/hw/ehca/ehca_main.c |4 +-
drivers/isdn/gigaset/common.c |3 +-
drivers/mtd/nand/s3c2410.c |2 +-
drivers/net/ax88796.c |2 +-
drivers/net/bnx2.c |2 +-
drivers/net/ehea/ehea_main.c |9 ---
drivers/net/myri10ge/myri10ge.c|3 +-
drivers/net/sky2.c |2 +-
drivers/net/usb/mcs7830.c | 16 +++---
drivers/net/xen-netfront.c |2 +-
drivers/power/ds2760_battery.c |2 +-
drivers/ps3/ps3stor_lib.c |2 +-
drivers/rtc/rtc-sysfs.c|5 +--
drivers/scsi/lpfc/lpfc_sli.c |8 --
drivers/scsi/qla4xxx/ql4_os.c |2 +-
drivers/spi/atmel_spi.c|2 +-
drivers/spi/spi_bfin5xx.c |2 +-
drivers/spi/spi_imx.c |4 +-
drivers/usb/class/cdc-acm.c| 34
drivers/usb/core/endpoint.c|2 +-
drivers/usb/core/message.c |4 +-
drivers/usb/host/ohci-s3c2410.c|2 +-
drivers/usb/misc/adutux.c |4 +-
drivers/usb/misc/iowarrior.c |8 +++---
drivers/usb/misc/phidgetmotorcontrol.c |2 +-
drivers/usb/serial/ftdi_sio.c |4 +-
drivers/usb/serial/io_edgeport.c |2 +-
drivers/usb/serial/ipw.c | 18
drivers/usb/serial/mos7720.c |4 +-
drivers/usb/serial/oti6858.c |2 +-
drivers/usb/serial/sierra.c| 10
drivers/video/gxt4500.c|2 +-
drivers/video/omap/blizzard.c |2 +-
drivers/video/omap/dispc.c |6 ++--
drivers/video/omap/hwa742.c|2 +-
drivers/video/omap/rfbi.c |4 +-
drivers/video/s3c2410fb.c |2 +-
drivers/w1/masters/ds1wm.c |2 +-
drivers/xen/xenbus/xenbus_probe.c |5 ++-
sound/arm/aaci.c |4 +-
51 files changed, 129 insertions(+), 119 deletions(-)
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index e58fcad..a5df672 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -269,8 +269,9 @@ xpnet_receive(partid_t partid, int channel, struct
xpnet_message *msg)
skb->protocol = eth_type_trans(skb, xpnet_device);
skb->ip_summed = CHECKSUM_UNNECESSARY;
- dev_dbg(xpnet, "passing skb to network layer; \n\tskb->head=0x%p "
- "skb->data=0x%p skb->tail=0x%p skb->end=0x%p skb->len=%d\n",
+ dev_dbg(xpnet, "passing skb to network layer\n"
+ KERN_DEBUG "\tskb->head=0x%p skb->data=0x%p skb->tail=0x%p "
+ "skb->end=0x%p skb->len=%d\n",
(void *)skb->head, (void *)skb->data, skb_tail_pointer(skb),
skb_end_pointer(skb), skb->len);
@@ -576,10 +577,10 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct
net_device *dev)
msg->tailout_ignore = end_addr - (u64)skb_tail_pointer(skb);
msg->buf_pa = __pa(start_addr);
- dev_dbg(xpnet, "sending XPC message to %d:%d\nmsg->buf_pa="
- "0x%lx, msg->size=%u, msg->leadin_ignore=%u, "
- "msg->tailout_ignore=%u\n", dest_partid,
- XPC_NET_CHANNEL, msg->buf_pa, msg->size,
+ dev_dbg(xpnet, "sending XPC message to %d:%d\n"
+ KERN_DEBUG "msg->buf_pa=0x%lx, msg->size=%u, "
+ "msg->leadin_ignore=%u, msg->tailout_ignore=%u\n",
+ dest_partid, XPC_NET_CHANNEL, msg->buf_pa, msg->size,
msg->leadin_ignore, msg->tailout_ignore);
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index cb27e88..e988710 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -383,8 +383,8 @@ static inline void ace_dump_mem(void *base, int len)
static void ace_dump_regs(struct ace_device *ace)
{
dev_info(ace->dev, "ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n"
-
