linux-next: input tree build failure

linux-next: input tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 629 bytes --]

Hi Dmitry,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/input/mouse/bcm5974.c: In function 'report_tp_state':
drivers/input/mouse/bcm5974.c:301: error: 'raw_n' undeclared (first use in this function)
drivers/input/mouse/bcm5974.c:341: error: 'ibt' undeclared (first use in this function)

Caused by commit d86c56b75718295025be895a0f7a157298c84491 ("Input:
bcm5974 - augment debug information").

I have merged the version of the input tree from next-20090306 instead of
today's.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: input tree build failure

[Dmitry Torokhov]

Hi Stephen,

On Tue, Mar 10, 2009 at 03:49:19PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/input/mouse/bcm5974.c: In function 'report_tp_state':
> drivers/input/mouse/bcm5974.c:301: error: 'raw_n' undeclared (first use in this function)
> drivers/input/mouse/bcm5974.c:341: error: 'ibt' undeclared (first use in this function)
> 
> Caused by commit d86c56b75718295025be895a0f7a157298c84491 ("Input:
> bcm5974 - augment debug information").
> 
> I have merged the version of the input tree from next-20090306 instead of
> today's.

I just noticed the failure and rebuilt the tree without that patch as
it was dependent upon another bcm change. Sorry about that.

-- 
Dmitry

Re: linux-next: input tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

Hi Dmitry,

On Mon, 9 Mar 2009 22:02:51 -0700 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> I just noticed the failure and rebuilt the tree without that patch as
> it was dependent upon another bcm change. Sorry about that.

OK, thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: input tree build failure

[Tobias Klauser]

On 2010-01-25 at 07:46:03 +0100, Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> On Mon, Jan 25, 2010 at 04:52:19PM +1100, Stephen Rothwell wrote:
> > Hi Dmitry,
> > 
> > Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
> > 
> > drivers/input/serio/xilinx_ps2.c: In function 'xps2_of_probe':
> > drivers/input/serio/xilinx_ps2.c:273: error: incompatible type for argument 1 of 'resource_size'
> > include/linux/ioport.h:132: note: expected 'const struct resource *' but argument is of type 'struct resource'
> > drivers/input/serio/xilinx_ps2.c: In function 'xps2_of_remove':
> > drivers/input/serio/xilinx_ps2.c:347: error: incompatible type for argument 1 of 'resource_size'
> > include/linux/ioport.h:132: note: expected 'const struct resource *' but argument is of type 'struct resource'
> > 
> > Please at least build test this stuff ...
> > 
> > Caused by commit cc7bbfa322b48be82b1c86a104433d4ac349da79 ("Input:
> > xilinx_ps2 - use resource_size").
> > 
> > I have reverted that commit for today.
> > 
> 
> Argh, sorry about that. I adjusted the commit; John, Tobias, please
> verify (next branch in my tree).

Sorry, that was completely my fault. I didn't have the appropriate build
environment to at least build test it.

The adjusted commit looks fine to me.

Sorry again,
Tobias

Re: linux-next: input tree build failure

[Dmitry Torokhov]

On Mon, Jan 25, 2010 at 04:52:19PM +1100, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next build (powerpc ppc44x_defconfig) failed like this:
> 
> drivers/input/serio/xilinx_ps2.c: In function 'xps2_of_probe':
> drivers/input/serio/xilinx_ps2.c:273: error: incompatible type for argument 1 of 'resource_size'
> include/linux/ioport.h:132: note: expected 'const struct resource *' but argument is of type 'struct resource'
> drivers/input/serio/xilinx_ps2.c: In function 'xps2_of_remove':
> drivers/input/serio/xilinx_ps2.c:347: error: incompatible type for argument 1 of 'resource_size'
> include/linux/ioport.h:132: note: expected 'const struct resource *' but argument is of type 'struct resource'
> 
> Please at least build test this stuff ...
> 
> Caused by commit cc7bbfa322b48be82b1c86a104433d4ac349da79 ("Input:
> xilinx_ps2 - use resource_size").
> 
> I have reverted that commit for today.
> 

Argh, sorry about that. I adjusted the commit; John, Tobias, please
verify (next branch in my tree).

Thanks.

-- 
Dmitry

linux-next: input tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 937 bytes --]

Hi Dmitry,

Today's linux-next build (powerpc ppc44x_defconfig) failed like this:

drivers/input/serio/xilinx_ps2.c: In function 'xps2_of_probe':
drivers/input/serio/xilinx_ps2.c:273: error: incompatible type for argument 1 of 'resource_size'
include/linux/ioport.h:132: note: expected 'const struct resource *' but argument is of type 'struct resource'
drivers/input/serio/xilinx_ps2.c: In function 'xps2_of_remove':
drivers/input/serio/xilinx_ps2.c:347: error: incompatible type for argument 1 of 'resource_size'
include/linux/ioport.h:132: note: expected 'const struct resource *' but argument is of type 'struct resource'

Please at least build test this stuff ...

Caused by commit cc7bbfa322b48be82b1c86a104433d4ac349da79 ("Input:
xilinx_ps2 - use resource_size").

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: input tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

Hi Dmitry,

On Mon, 7 Dec 2009 09:36:41 -0800 Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
>
> I removed the stray EXPORT_SYMBOL(), shold be good now.

Thanks.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: input tree build failure

[Dmitry Torokhov]

On Mon, Dec 07, 2009 at 08:25:36AM -0800, Randy Dunlap wrote:
> Stephen Rothwell wrote:
> > Hi Dmitry,
> > 
> > Today's linux-next build (powerpc allyesconfig) failed like this:
> > 
> > drivers/input/sparse-keymap.c:101: error: __ksymtab_sparse_keymap_setkeycode causes a section type conflict
> > 
> > Caused by commit a2dd9f7ceeb28f495587834aa5778c721611d61b ("Input: add
> > generic support for sparse keymaps").
> > 
> > static functions should not given to EXPORT_SYMBOL().
> > 
> > I have reverted that commit for today.
> 
> (DT:) Is that what causes wistron_btns builds to fail also?
> 

Umm... Wistron and dm355evm_keys now using sparse keymap library so if
it is missing they would fail to compile.

I removed the stray EXPORT_SYMBOL(), shold be good now.

-- 
Dmitry

Re: linux-next: input tree build failure

[Randy Dunlap]

Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next build (powerpc allyesconfig) failed like this:
> 
> drivers/input/sparse-keymap.c:101: error: __ksymtab_sparse_keymap_setkeycode causes a section type conflict
> 
> Caused by commit a2dd9f7ceeb28f495587834aa5778c721611d61b ("Input: add
> generic support for sparse keymaps").
> 
> static functions should not given to EXPORT_SYMBOL().
> 
> I have reverted that commit for today.

(DT:) Is that what causes wistron_btns builds to fail also?

-- 
~Randy

linux-next: input tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 511 bytes --]

Hi Dmitry,

Today's linux-next build (powerpc allyesconfig) failed like this:

drivers/input/sparse-keymap.c:101: error: __ksymtab_sparse_keymap_setkeycode causes a section type conflict

Caused by commit a2dd9f7ceeb28f495587834aa5778c721611d61b ("Input: add
generic support for sparse keymaps").

static functions should not given to EXPORT_SYMBOL().

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: input tree build failure

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 459 bytes --]

Hi Alfred,

On Sat, 23 Aug 2008 00:15:06 +0200 "Alfred E. Heggestad" <aeh@db.org> wrote:
>
> I have tested the linux-next kernel on my i386 laptop with a
> CM109 device (Komunikate KIP1000) and it is still working.
> 
> This patch does some minor cleanups, and adds the missing
> newline to some debug statements.

Ooops!  Thanks, Alfred.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: input tree build failure

[Alfred E. Heggestad]

Dmitry Torokhov wrote:
> On Wed, Aug 20, 2008 at 03:49:24PM +1000, Stephen Rothwell wrote:
>> Hi Greg, Dmitry,
>>
>> On Tue, 19 Aug 2008 13:00:57 -0700 Greg KH <greg@kroah.com> wrote:
>>> No, these should all use dev_info() instead.
>>>
>>> Actually, they should all use dev_dbg() and drop the #if entirely.  With
>>> the dynamic dev_dbg() patch that is in -next, that will work just fine,
>>> no need to rebuild modules which is almost impossible for most users to
>>> do.
>> Today I used the following patch instead.  Dmitry, this should be able to
>> be applied to your tree (I think) assuming that it is OK.
>>
> 
> Applied, thank you Stephen.
> 

I have tested the linux-next kernel on my i386 laptop with a
CM109 device (Komunikate KIP1000) and it is still working.

This patch does some minor cleanups, and adds the missing
newline to some debug statements.


Signed-off-by: Alfred E. Heggestad <aeh@db.org>
Tested-by: Alfred E. Heggestad <aeh@db.org>
---
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 0a11029..3d3cc2d 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -36,8 +36,6 @@
 #include <linux/rwsem.h>
 #include <linux/usb/input.h>
 
-#define CM109_DEBUG 0
-
 #define DRIVER_VERSION "20080805"
 #define DRIVER_AUTHOR  "Alfred E. Heggestad"
 #define DRIVER_DESC    "CM109 phone driver"
@@ -311,7 +309,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
 	const int status = urb->status;
 	int error;
 
-	dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",
+	dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
 	     dev->irq_data->byte[0],
 	     dev->irq_data->byte[1],
 	     dev->irq_data->byte[2],
@@ -381,7 +379,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
 	const int status = urb->status;
 	int error;
 
-	dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]",
+	dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
 	     dev->ctl_data->byte[0],
 	     dev->ctl_data->byte[1],
 	     dev->ctl_data->byte[2],
@@ -545,7 +543,7 @@ static int cm109_input_ev(struct input_dev *idev, unsigned int type,
 {
 	struct cm109_dev *dev = input_get_drvdata(idev);
 
-	dev_dbg(&idev->dev, "input_ev: type=%u code=%u value=%d", type, code, value);
+	dev_dbg(&idev->dev, "input_ev: type=%u code=%u value=%d\n", type, code, value);
 
 	if (type != EV_SND)
 		return -EINVAL;
@@ -759,8 +757,6 @@ static int cm109_usb_suspend(struct usb_interface *intf, pm_message_t message)
 {
 	struct cm109_dev *dev = usb_get_intfdata(intf);
 
-	dev_info(&intf->dev, "cm109: usb_suspend (event=%d)", message.event);
-
 	mutex_lock(&dev->pm_mutex);
 	cm109_stop_traffic(dev);
 	mutex_unlock(&dev->pm_mutex);
@@ -772,8 +768,6 @@ static int cm109_usb_resume(struct usb_interface *intf)
 {
 	struct cm109_dev *dev = usb_get_intfdata(intf);
 
-	dev_info(&intf->dev, "cm109: usb_resume");
-
 	mutex_lock(&dev->pm_mutex);
 	cm109_restore_state(dev);
 	mutex_unlock(&dev->pm_mutex);
@@ -832,18 +826,18 @@ static int __init cm109_select_keymap(void)
 	if (!strcasecmp(phone, "kip1000")) {
 		keymap = keymap_kip1000;
 		printk(KERN_INFO KBUILD_MODNAME ": "
-			"Keymap for Komunikate KIP1000 phone loaded");
+			"Keymap for Komunikate KIP1000 phone loaded\n");
 	} else if (!strcasecmp(phone, "gtalk")) {
 		keymap = keymap_gtalk;
 		printk(KERN_INFO KBUILD_MODNAME ": "
-			"Keymap for Genius G-talk phone loaded");
+			"Keymap for Genius G-talk phone loaded\n");
 	} else if (!strcasecmp(phone, "usbph01")) {
 		keymap = keymap_usbph01;
 		printk(KERN_INFO KBUILD_MODNAME ": "
-			"Keymap for Allied-Telesis Corega USBPH01 phone loaded");
+			"Keymap for Allied-Telesis Corega USBPH01 phone loaded\n");
 	} else {
 		printk(KERN_ERR KBUILD_MODNAME ": "
-			"Unsupported phone: %s", phone);
+			"Unsupported phone: %s\n", phone);
 		return -EINVAL;
 	}
 
@@ -863,7 +857,7 @@ static int __init cm109_init(void)
 		return err;
 
 	printk(KERN_INFO KBUILD_MODNAME ": "
-		DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR);
+		DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR "\n");
 
 	return 0;
 }

Re: linux-next: input tree build failure

[Dmitry Torokhov]

On Wed, Aug 20, 2008 at 03:49:24PM +1000, Stephen Rothwell wrote:
> Hi Greg, Dmitry,
> 
> On Tue, 19 Aug 2008 13:00:57 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > No, these should all use dev_info() instead.
> > 
> > Actually, they should all use dev_dbg() and drop the #if entirely.  With
> > the dynamic dev_dbg() patch that is in -next, that will work just fine,
> > no need to rebuild modules which is almost impossible for most users to
> > do.
> 
> Today I used the following patch instead.  Dmitry, this should be able to
> be applied to your tree (I think) assuming that it is OK.
> 

Applied, thank you Stephen.

-- 
Dmitry

Re: linux-next: input tree build failure

[Greg KH]

On Wed, Aug 20, 2008 at 03:49:24PM +1000, Stephen Rothwell wrote:
> Hi Greg, Dmitry,
> 
> On Tue, 19 Aug 2008 13:00:57 -0700 Greg KH <greg@kroah.com> wrote:
> >
> > No, these should all use dev_info() instead.
> > 
> > Actually, they should all use dev_dbg() and drop the #if entirely.  With
> > the dynamic dev_dbg() patch that is in -next, that will work just fine,
> > no need to rebuild modules which is almost impossible for most users to
> > do.
> 
> Today I used the following patch instead.  Dmitry, this should be able to
> be applied to your tree (I think) assuming that it is OK.

Looks good to me.

thanks,

greg k-h

Re: linux-next: input tree build failure

[Stephen Rothwell]

Hi Greg, Dmitry,

On Tue, 19 Aug 2008 13:00:57 -0700 Greg KH <greg@kroah.com> wrote:
>
> No, these should all use dev_info() instead.
> 
> Actually, they should all use dev_dbg() and drop the #if entirely.  With
> the dynamic dev_dbg() patch that is in -next, that will work just fine,
> no need to rebuild modules which is almost impossible for most users to
> do.

Today I used the following patch instead.  Dmitry, this should be able to
be applied to your tree (I think) assuming that it is OK.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 066af730859c2c2ce2c6a76d21edded33414b735 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Aug 2008 15:40:08 +1000
Subject: [PATCH] input/cm109: fix up for info() removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/input/misc/cm109.c |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 404fd49..a4771cc 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -311,14 +311,12 @@ static void cm109_urb_irq_callback(struct urb *urb)
 	const int status = urb->status;
 	int error;
 
-#if CM109_DEBUG
-	info("### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",
+	dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",
 	     dev->irq_data->byte[0],
 	     dev->irq_data->byte[1],
 	     dev->irq_data->byte[2],
 	     dev->irq_data->byte[3],
 	     dev->keybit);
-#endif
 
 	if (status) {
 		if (status == -ESHUTDOWN)
@@ -383,13 +381,11 @@ static void cm109_urb_ctl_callback(struct urb *urb)
 	const int status = urb->status;
 	int error;
 
-#if CM109_DEBUG
-	info("### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]",
+	dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]",
 	     dev->ctl_data->byte[0],
 	     dev->ctl_data->byte[1],
 	     dev->ctl_data->byte[2],
 	     dev->ctl_data->byte[3]);
-#endif
 
 	if (status)
 		err("%s: urb status %d", __func__, status);
@@ -549,9 +545,7 @@ static int cm109_input_ev(struct input_dev *idev, unsigned int type,
 {
 	struct cm109_dev *dev = input_get_drvdata(idev);
 
-#if CM109_DEBUG
-	info("input_ev: type=%u code=%u value=%d", type, code, value);
-#endif
+	dev_dbg(&idev->dev, "input_ev: type=%u code=%u value=%d", type, code, value);
 
 	if (type != EV_SND)
 		return -EINVAL;
@@ -765,7 +759,7 @@ static int cm109_usb_suspend(struct usb_interface *intf, pm_message_t message)
 {
 	struct cm109_dev *dev = usb_get_intfdata(intf);
 
-	info("cm109: usb_suspend (event=%d)", message.event);
+	dev_info(&intf->dev, "cm109: usb_suspend (event=%d)", message.event);
 
 	mutex_lock(&dev->pm_mutex);
 	cm109_stop_traffic(dev);
@@ -778,7 +772,7 @@ static int cm109_usb_resume(struct usb_interface *intf)
 {
 	struct cm109_dev *dev = usb_get_intfdata(intf);
 
-	info("cm109: usb_resume");
+	dev_info(&intf->dev, "cm109: usb_resume");
 
 	mutex_lock(&dev->pm_mutex);
 	cm109_restore_state(dev);
@@ -837,15 +831,19 @@ static int __init cm109_select_keymap(void)
 	/* Load the phone keymap */
 	if (!strcasecmp(phone, "kip1000")) {
 		keymap = keymap_kip1000;
-		info("Keymap for Komunikate KIP1000 phone loaded");
+		printk(KERN_INFO KBUILD_MODNAME ": "
+			"Keymap for Komunikate KIP1000 phone loaded");
 	} else if (!strcasecmp(phone, "gtalk")) {
 		keymap = keymap_gtalk;
-		info("Keymap for Genius G-talk phone loaded");
+		printk(KERN_INFO KBUILD_MODNAME ": "
+			"Keymap for Genius G-talk phone loaded");
 	} else if (!strcasecmp(phone, "usbph01")) {
 		keymap = keymap_usbph01;
-		info("Keymap for Allied-Telesis Corega USBPH01 phone loaded");
+		printk(KERN_INFO KBUILD_MODNAME ": "
+			"Keymap for Allied-Telesis Corega USBPH01 phone loaded");
 	} else {
-		err("Unsupported phone: %s", phone);
+		printk(KERN_ERR KBUILD_MODNAME ": "
+			"Unsupported phone: %s", phone);
 		return -EINVAL;
 	}
 
@@ -864,7 +862,8 @@ static int __init cm109_init(void)
 	if (err)
 		return err;
 
-	info(DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR);
+	printk(KERN_INFO KBUILD_MODNAME ": "
+		DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR);
 
 	return 0;
 }
-- 
1.5.6.3

Re: linux-next: input tree build failure

[Greg KH]

On Tue, Aug 19, 2008 at 04:31:48PM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/input/misc/cm109.c: In function 'cm109_usb_suspend':
> drivers/input/misc/cm109.c:768: error: implicit declaration of function 'info'
> 
> Caused by commit c04148f915e5ba7947752e6348e0da4cdab1329e ("Input: add
> driver for USB VoIP phones with CM109 chipset") adding a usage of the info
> () function while commit 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB:
> remove info() macro from usb.h") from the usb tree removed it.
> 
> I applied the following patch (which may not be the best).
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
> 
> >From 2a58297038a91ef5ffba3df4a5bd7576735ca205 Mon Sep 17 00:00:00 2001
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 19 Aug 2008 16:28:15 +1000
> Subject: [PATCH] input/cm109: fix up for info() removal
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/input/misc/cm109.c |   26 +++++++++++++++++---------
>  1 files changed, 17 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
> index 404fd49..595b3b1 100644
> --- a/drivers/input/misc/cm109.c
> +++ b/drivers/input/misc/cm109.c
> @@ -312,7 +312,8 @@ static void cm109_urb_irq_callback(struct urb *urb)
>  	int error;
>  
>  #if CM109_DEBUG
> -	info("### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",
> +	printk(KERN_INFO KBUILD_MODNAME ": "
> +	     "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",

No, these should all use dev_info() instead.

Actually, they should all use dev_dbg() and drop the #if entirely.  With
the dynamic dev_dbg() patch that is in -next, that will work just fine,
no need to rebuild modules which is almost impossible for most users to
do.

thanks,

greg k-h

Re: linux-next: input tree build failure

[Greg KH]

On Tue, Aug 19, 2008 at 09:01:24AM -0400, Dmitry Torokhov wrote:
> On Tue, Aug 19, 2008 at 04:31:48PM +1000, Stephen Rothwell wrote:
> > Hi Dmitry,
> > 
> > Today's linux-next build (x86_64 allmodconfig) failed like this:
> > 
> > drivers/input/misc/cm109.c: In function 'cm109_usb_suspend':
> > drivers/input/misc/cm109.c:768: error: implicit declaration of function 'info'
> > 
> > Caused by commit c04148f915e5ba7947752e6348e0da4cdab1329e ("Input: add
> > driver for USB VoIP phones with CM109 chipset") adding a usage of the info
> > () function while commit 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB:
> > remove info() macro from usb.h") from the usb tree removed it.
> > 
> > I applied the following patch (which may not be the best).
> 
> Thank you Stephen, but I wonder if total removal of info() and warn()
> is a good thing, since they provide standard way of outputting data
> from modules when there is no device, i.e. at the time of driver
> registration or removal.
> 
> Greg, do you think we could keep err, warn and info (maybe renaming to
> dr_err, dr_warn and dr_info and probably moving them to kernel.h)
> while still taking the parts of your patch that convert drivers to use
> dev_* macros when possible?

No, the goal here is to remove macros that merely wrap up printk().  The
err(), warn(), and info() macros are _old_ (2.3 days), and whenever you
use or see them you need to remember exactly what they do (add the
file/module name, no \n needed, etc.)

In the _very rare_ cases that you need/want a printk and you don't have
access to a struct device in a module, then just use a call to printk().
That way everyone knows exactly what you are doing, you don't have to
remember the wierd \n issues, and people can later just remove them as
usually they are pointless (advertising that a module is loaded is
generally just noise.)

So I really don't want to re-introduce these functions, especially given
the work to standardize on kernel messages, we want to clean up the
code, not add more options to developers to get wrong :)

thanks,

greg k-h

Re: linux-next: input tree build failure

[Dmitry Torokhov]

On Tue, Aug 19, 2008 at 04:31:48PM +1000, Stephen Rothwell wrote:
> Hi Dmitry,
> 
> Today's linux-next build (x86_64 allmodconfig) failed like this:
> 
> drivers/input/misc/cm109.c: In function 'cm109_usb_suspend':
> drivers/input/misc/cm109.c:768: error: implicit declaration of function 'info'
> 
> Caused by commit c04148f915e5ba7947752e6348e0da4cdab1329e ("Input: add
> driver for USB VoIP phones with CM109 chipset") adding a usage of the info
> () function while commit 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB:
> remove info() macro from usb.h") from the usb tree removed it.
> 
> I applied the following patch (which may not be the best).

Thank you Stephen, but I wonder if total removal of info() and warn()
is a good thing, since they provide standard way of outputting data
from modules when there is no device, i.e. at the time of driver
registration or removal.

Greg, do you think we could keep err, warn and info (maybe renaming to
dr_err, dr_warn and dr_info and probably moving them to kernel.h)
while still taking the parts of your patch that convert drivers to use
dev_* macros when possible?

-- 
Dmitry

linux-next: input tree build failure

[Stephen Rothwell]

Hi Dmitry,

Today's linux-next build (x86_64 allmodconfig) failed like this:

drivers/input/misc/cm109.c: In function 'cm109_usb_suspend':
drivers/input/misc/cm109.c:768: error: implicit declaration of function 'info'

Caused by commit c04148f915e5ba7947752e6348e0da4cdab1329e ("Input: add
driver for USB VoIP phones with CM109 chipset") adding a usage of the info
() function while commit 8aac48f4f2460b00468fd5f1101addf3df04e94c ("USB:
remove info() macro from usb.h") from the usb tree removed it.

I applied the following patch (which may not be the best).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 2a58297038a91ef5ffba3df4a5bd7576735ca205 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 Aug 2008 16:28:15 +1000
Subject: [PATCH] input/cm109: fix up for info() removal

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/input/misc/cm109.c |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c
index 404fd49..595b3b1 100644
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
@@ -312,7 +312,8 @@ static void cm109_urb_irq_callback(struct urb *urb)
 	int error;
 
 #if CM109_DEBUG
-	info("### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",
+	printk(KERN_INFO KBUILD_MODNAME ": "
+	     "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x",
 	     dev->irq_data->byte[0],
 	     dev->irq_data->byte[1],
 	     dev->irq_data->byte[2],
@@ -384,7 +385,8 @@ static void cm109_urb_ctl_callback(struct urb *urb)
 	int error;
 
 #if CM109_DEBUG
-	info("### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]",
+	printk(KERN_INFO KBUILD_MODNAME ": "
+	     "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]",
 	     dev->ctl_data->byte[0],
 	     dev->ctl_data->byte[1],
 	     dev->ctl_data->byte[2],
@@ -550,7 +552,8 @@ static int cm109_input_ev(struct input_dev *idev, unsigned int type,
 	struct cm109_dev *dev = input_get_drvdata(idev);
 
 #if CM109_DEBUG
-	info("input_ev: type=%u code=%u value=%d", type, code, value);
+	printk(KERN_INFO KBUILD_MODNAME ": "
+	       "input_ev: type=%u code=%u value=%d", type, code, value);
 #endif
 
 	if (type != EV_SND)
@@ -765,7 +768,8 @@ static int cm109_usb_suspend(struct usb_interface *intf, pm_message_t message)
 {
 	struct cm109_dev *dev = usb_get_intfdata(intf);
 
-	info("cm109: usb_suspend (event=%d)", message.event);
+	printk(KERN_INFO KBUILD_MODNAME ": usb_suspend (event=%d)",
+		message.event);
 
 	mutex_lock(&dev->pm_mutex);
 	cm109_stop_traffic(dev);
@@ -778,7 +782,7 @@ static int cm109_usb_resume(struct usb_interface *intf)
 {
 	struct cm109_dev *dev = usb_get_intfdata(intf);
 
-	info("cm109: usb_resume");
+	printk(KERN_INFO KBUILD_MODNAME ": usb_resume");
 
 	mutex_lock(&dev->pm_mutex);
 	cm109_restore_state(dev);
@@ -837,13 +841,16 @@ static int __init cm109_select_keymap(void)
 	/* Load the phone keymap */
 	if (!strcasecmp(phone, "kip1000")) {
 		keymap = keymap_kip1000;
-		info("Keymap for Komunikate KIP1000 phone loaded");
+		printk(KERN_INFO KBUILD_MODNAME ": "
+		       "Keymap for Komunikate KIP1000 phone loaded");
 	} else if (!strcasecmp(phone, "gtalk")) {
 		keymap = keymap_gtalk;
-		info("Keymap for Genius G-talk phone loaded");
+		printk(KERN_INFO KBUILD_MODNAME ": "
+		       "Keymap for Genius G-talk phone loaded");
 	} else if (!strcasecmp(phone, "usbph01")) {
 		keymap = keymap_usbph01;
-		info("Keymap for Allied-Telesis Corega USBPH01 phone loaded");
+		printk(KERN_INFO KBUILD_MODNAME ": "
+		       "Keymap for Allied-Telesis Corega USBPH01 phone loaded");
 	} else {
 		err("Unsupported phone: %s", phone);
 		return -EINVAL;
@@ -864,7 +871,8 @@ static int __init cm109_init(void)
 	if (err)
 		return err;
 
-	info(DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR);
+	printk(KERN_INFO KBUILD_MODNAME ": "
+	       DRIVER_DESC ": " DRIVER_VERSION " (C) " DRIVER_AUTHOR);
 
 	return 0;
 }
-- 
1.5.6.3