[CBUS PATCH 1/2] cbus: fix compilation with current mainline

[CBUS PATCH 1/2] cbus: fix compilation with current mainline

[Felipe Balbi]

From: Felipe Balbi <me@felipebalbi.com>

commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 broke
compilation of the retu-pwrbutton driver when it dropped
implicit inclusion of slab.h and gfp.h.

Fix it by including slab.h on retu-pwrbutton.c, while at
that, also include slab.h on retu-rtc.c to avoid later
problems with implicit inclusion of that being dropped.

Compile tested with n770_defconfig and n8x0_defconfig

Signed-off-by: Felipe Balbi <me@felipebalbi.com>
---
 drivers/cbus/retu-pwrbutton.c |    1 +
 drivers/cbus/retu-rtc.c       |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/cbus/retu-pwrbutton.c b/drivers/cbus/retu-pwrbutton.c
index 2d8cf40..f0cd056 100644
--- a/drivers/cbus/retu-pwrbutton.c
+++ b/drivers/cbus/retu-pwrbutton.c
@@ -34,6 +34,7 @@
 #include <linux/jiffies.h>
 #include <linux/bitops.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include "retu.h"
 
diff --git a/drivers/cbus/retu-rtc.c b/drivers/cbus/retu-rtc.c
index b0a0f3d..b3974e2 100644
--- a/drivers/cbus/retu-rtc.c
+++ b/drivers/cbus/retu-rtc.c
@@ -36,6 +36,7 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/platform_device.h>
-- 
1.7.1.rc2.7.g3e7f1

[CBUS PATCH 2/2] cbus: switch kmalloc() + memset() to kzalloc()

[Felipe Balbi]

From: Felipe Balbi <me@felipebalbi.com>

no functional changes, just using kzalloc().

compile tested with n8x0_defconfig and n770_defconfig

Signed-off-by: Felipe Balbi <me@felipebalbi.com>
---
 drivers/cbus/retu-user.c  |    6 +++---
 drivers/cbus/tahvo-usb.c  |    4 ++--
 drivers/cbus/tahvo-user.c |    6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/cbus/retu-user.c b/drivers/cbus/retu-user.c
index 1a29492..953d92a 100644
--- a/drivers/cbus/retu-user.c
+++ b/drivers/cbus/retu-user.c
@@ -382,12 +382,12 @@ int retu_user_init(void)
 	struct retu_irq *irq;
 	int res, i;
 
-	irq = kmalloc(sizeof(*irq) * RETU_MAX_IRQ_BUF_LEN, GFP_KERNEL);
+	irq = kzalloc(sizeof(*irq) * RETU_MAX_IRQ_BUF_LEN, GFP_KERNEL);
 	if (irq == NULL) {
-		printk(KERN_ERR PFX "kmalloc failed\n");
+		printk(KERN_ERR PFX "kzalloc failed\n");
 		return -ENOMEM;
 	}
-	memset(irq, 0, sizeof(*irq) * RETU_MAX_IRQ_BUF_LEN);
+
 	for (i = 0; i < RETU_MAX_IRQ_BUF_LEN; i++)
 		list_add(&irq[i].node, &retu_irqs_reserve);
 
diff --git a/drivers/cbus/tahvo-usb.c b/drivers/cbus/tahvo-usb.c
index ef9fc37..5a344b6 100644
--- a/drivers/cbus/tahvo-usb.c
+++ b/drivers/cbus/tahvo-usb.c
@@ -655,10 +655,10 @@ static int tahvo_usb_probe(struct device *dev)
 	dev_dbg(dev, "probe\n");
 
 	/* Create driver data */
-	tu = kmalloc(sizeof(*tu), GFP_KERNEL);
+	tu = kzalloc(sizeof(*tu), GFP_KERNEL);
 	if (!tu)
 		return -ENOMEM;
-	memset(tu, 0, sizeof(*tu));
+
 	tu->pt_dev = container_of(dev, struct platform_device, dev);
 #ifdef CONFIG_USB_OTG
 	/* Default mode */
diff --git a/drivers/cbus/tahvo-user.c b/drivers/cbus/tahvo-user.c
index 01e7f20..bd30f06 100644
--- a/drivers/cbus/tahvo-user.c
+++ b/drivers/cbus/tahvo-user.c
@@ -364,12 +364,12 @@ int tahvo_user_init(void)
 	struct tahvo_irq *irq;
 	int res, i;
 
-	irq = kmalloc(sizeof(*irq) * TAHVO_MAX_IRQ_BUF_LEN, GFP_KERNEL);
+	irq = kzalloc(sizeof(*irq) * TAHVO_MAX_IRQ_BUF_LEN, GFP_KERNEL);
 	if (irq == NULL) {
-		printk(KERN_ERR PFX "kmalloc failed\n");
+		printk(KERN_ERR PFX "kzalloc failed\n");
 		return -ENOMEM;
 	}
-	memset(irq, 0, sizeof(*irq) * TAHVO_MAX_IRQ_BUF_LEN);
+
 	for (i = 0; i < TAHVO_MAX_IRQ_BUF_LEN; i++)
 		list_add(&irq[i].node, &tahvo_irqs_reserve);
 
-- 
1.7.1.rc2.7.g3e7f1

Re: [CBUS PATCH 1/2] cbus: fix compilation with current mainline

[Jarkko Nikula]

On Sat,  1 May 2010 21:01:09 +0300
Felipe Balbi <felipe.balbi@nokia.com> wrote:

> From: Felipe Balbi <me@felipebalbi.com>
> 
> commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 broke
> compilation of the retu-pwrbutton driver when it dropped
> implicit inclusion of slab.h and gfp.h.
> 
> Fix it by including slab.h on retu-pwrbutton.c, while at
> that, also include slab.h on retu-rtc.c to avoid later
> problems with implicit inclusion of that being dropped.
> 
> Compile tested with n770_defconfig and n8x0_defconfig
> 
> Signed-off-by: Felipe Balbi <me@felipebalbi.com>
> ---
>  drivers/cbus/retu-pwrbutton.c |    1 +
>  drivers/cbus/retu-rtc.c       |    1 +
>  2 files changed, 2 insertions(+), 0 deletions(-)
> 
Acked-by: Jarkko Nikula <jhnikula@gmail.com>

Re: [CBUS PATCH 2/2] cbus: switch kmalloc() + memset() to kzalloc()

[Jarkko Nikula]

On Sat,  1 May 2010 21:01:10 +0300
Felipe Balbi <felipe.balbi@nokia.com> wrote:

> From: Felipe Balbi <me@felipebalbi.com>
> 
> no functional changes, just using kzalloc().
> 
> compile tested with n8x0_defconfig and n770_defconfig
> 
> Signed-off-by: Felipe Balbi <me@felipebalbi.com>
> ---
>  drivers/cbus/retu-user.c  |    6 +++---
>  drivers/cbus/tahvo-usb.c  |    4 ++--
>  drivers/cbus/tahvo-user.c |    6 +++---
>  3 files changed, 8 insertions(+), 8 deletions(-)
> 
Acked-by: Jarkko Nikula <jhnikula@gmail.com>

[APPLIED] [CBUS PATCH 1/2] cbus: fix compilation with current mainline

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: cbus

Initial commit ID (Likely to change): f746c048052046009eafd6f71041204967e231a3

PatchWorks
http://patchwork.kernel.org/patch/96298/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=f746c048052046009eafd6f71041204967e231a3

[APPLIED] [CBUS PATCH 2/2] cbus: switch kmalloc() + memset() to kzalloc()

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: cbus

Initial commit ID (Likely to change): 749c6d8eaac8cd49b3d53eb7fb708ce61787a3a1

PatchWorks
http://patchwork.kernel.org/patch/96299/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=749c6d8eaac8cd49b3d53eb7fb708ce61787a3a1

[CBUS PATCH 1/1] CBUS: Fix broken compilation

[Carlos Chinea]

Include explicitly slab.h in:
	drivers/cbus/cbus.c
	drivers/cbus/retu-headset.c
	drivers/cbus/retu-user.c
	drivers/cbus/retu-wdt.c
	drivers/cbus/tahvo-user.c

Compile tested with n8x0_defconfig

Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com>
---
 drivers/cbus/cbus.c         |    1 +
 drivers/cbus/retu-headset.c |    1 +
 drivers/cbus/retu-user.c    |    1 +
 drivers/cbus/retu-wdt.c     |    1 +
 drivers/cbus/tahvo-user.c   |    1 +
 5 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/cbus/cbus.c b/drivers/cbus/cbus.c
index 00c3c32..2c74d6e 100644
--- a/drivers/cbus/cbus.c
+++ b/drivers/cbus/cbus.c
@@ -30,6 +30,7 @@
 #include <linux/spinlock.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/drivers/cbus/retu-headset.c b/drivers/cbus/retu-headset.c
index e798bc2..645679c 100644
--- a/drivers/cbus/retu-headset.c
+++ b/drivers/cbus/retu-headset.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include "retu.h"
 
diff --git a/drivers/cbus/retu-user.c b/drivers/cbus/retu-user.c
index 0f35dc5..7bc97d4 100644
--- a/drivers/cbus/retu-user.c
+++ b/drivers/cbus/retu-user.c
@@ -33,6 +33,7 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
diff --git a/drivers/cbus/retu-wdt.c b/drivers/cbus/retu-wdt.c
index 35932dd..fda8b35 100644
--- a/drivers/cbus/retu-wdt.c
+++ b/drivers/cbus/retu-wdt.c
@@ -35,6 +35,7 @@
 #include <linux/platform_device.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
diff --git a/drivers/cbus/tahvo-user.c b/drivers/cbus/tahvo-user.c
index c0e8daf..b28b015 100644
--- a/drivers/cbus/tahvo-user.c
+++ b/drivers/cbus/tahvo-user.c
@@ -33,6 +33,7 @@
 #include <linux/spinlock.h>
 #include <linux/sched.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
-- 
1.5.6.5

Re: [CBUS PATCH 1/1] CBUS: Fix broken compilation

[Felipe Balbi]

On Wed, May 05, 2010 at 06:05:29PM +0300, Carlos Chinea wrote:
> Include explicitly slab.h in:
> 	drivers/cbus/cbus.c
> 	drivers/cbus/retu-headset.c
> 	drivers/cbus/retu-user.c
> 	drivers/cbus/retu-wdt.c
> 	drivers/cbus/tahvo-user.c
> 
> Compile tested with n8x0_defconfig
> 
> Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com>

do you need to update your tree ? tony applied a patch from me already,
or did I miss something else ? I'm sure I compile with n770_defconf and
n8x0_defconfig.

-- 
balbi

Re: [CBUS PATCH 1/1] CBUS: Fix broken compilation

[Felipe Balbi]

hi again,


On Wed, May 05, 2010 at 05:05:29PM +0200, Chinea Carlos (Nokia-D/Helsinki) wrote:
>Include explicitly slab.h in:
>	drivers/cbus/cbus.c
>	drivers/cbus/retu-headset.c
>	drivers/cbus/retu-user.c
>	drivers/cbus/retu-wdt.c
>	drivers/cbus/tahvo-user.c
>
>Compile tested with n8x0_defconfig
>
>Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com>

I see now the problem.

>---
> drivers/cbus/cbus.c         |    1 +
> drivers/cbus/retu-headset.c |    1 +
> drivers/cbus/retu-user.c    |    1 +
> drivers/cbus/retu-wdt.c     |    1 +
> drivers/cbus/tahvo-user.c   |    1 +
> 5 files changed, 5 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/cbus/cbus.c b/drivers/cbus/cbus.c
>index 00c3c32..2c74d6e 100644
>--- a/drivers/cbus/cbus.c
>+++ b/drivers/cbus/cbus.c
>@@ -30,6 +30,7 @@
> #include <linux/spinlock.h>
> #include <linux/gpio.h>
> #include <linux/platform_device.h>
>+#include <linux/slab.h>

this is already included in line 32 of that file.

>diff --git a/drivers/cbus/retu-headset.c b/drivers/cbus/retu-headset.c
>index e798bc2..645679c 100644
>--- a/drivers/cbus/retu-headset.c
>+++ b/drivers/cbus/retu-headset.c
>@@ -25,6 +25,7 @@
> #include <linux/delay.h>
> #include <linux/input.h>
> #include <linux/platform_device.h>
>+#include <linux/slab.h>

already on line 25, right above #include <linux/delay.h>

>diff --git a/drivers/cbus/retu-user.c b/drivers/cbus/retu-user.c
>index 0f35dc5..7bc97d4 100644
>--- a/drivers/cbus/retu-user.c
>+++ b/drivers/cbus/retu-user.c
>@@ -33,6 +33,7 @@
> #include <linux/spinlock.h>
> #include <linux/sched.h>
> #include <linux/mutex.h>
>+#include <linux/slab.h>

already on line 26

>diff --git a/drivers/cbus/retu-wdt.c b/drivers/cbus/retu-wdt.c
>index 35932dd..fda8b35 100644
>--- a/drivers/cbus/retu-wdt.c
>+++ b/drivers/cbus/retu-wdt.c
>@@ -35,6 +35,7 @@
> #include <linux/platform_device.h>
> #include <linux/miscdevice.h>
> #include <linux/watchdog.h>
>+#include <linux/slab.h>

already on line 25

>diff --git a/drivers/cbus/tahvo-user.c b/drivers/cbus/tahvo-user.c
>index c0e8daf..b28b015 100644
>--- a/drivers/cbus/tahvo-user.c
>+++ b/drivers/cbus/tahvo-user.c
>@@ -33,6 +33,7 @@
> #include <linux/spinlock.h>
> #include <linux/sched.h>
> #include <linux/mutex.h>
>+#include <linux/slab.h>

already on line 26.

NAK to this patch.

-- 
balbi

DefectiveByDesign.org

Re: [CBUS PATCH 1/1] CBUS: Fix broken compilation

[Carlos Chinea]

Ok, sorry for the noise. I missed Alexander Shishkin patch which took
care of this already.

On Wed, 2010-05-05 at 21:00 +0200, Balbi Felipe (Nokia-D/Helsinki)
wrote:
> hi again,
> 
> 
> On Wed, May 05, 2010 at 05:05:29PM +0200, Chinea Carlos (Nokia-D/Helsinki) wrote:
> >Include explicitly slab.h in:
> >	drivers/cbus/cbus.c
> >	drivers/cbus/retu-headset.c
> >	drivers/cbus/retu-user.c
> >	drivers/cbus/retu-wdt.c
> >	drivers/cbus/tahvo-user.c
> >
> >Compile tested with n8x0_defconfig
> >
> >Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com>
> 
> I see now the problem.
> 
> >---
> > drivers/cbus/cbus.c         |    1 +
> > drivers/cbus/retu-headset.c |    1 +
> > drivers/cbus/retu-user.c    |    1 +
> > drivers/cbus/retu-wdt.c     |    1 +
> > drivers/cbus/tahvo-user.c   |    1 +
> > 5 files changed, 5 insertions(+), 0 deletions(-)
> >
> >diff --git a/drivers/cbus/cbus.c b/drivers/cbus/cbus.c
> >index 00c3c32..2c74d6e 100644
> >--- a/drivers/cbus/cbus.c
> >+++ b/drivers/cbus/cbus.c
> >@@ -30,6 +30,7 @@
> > #include <linux/spinlock.h>
> > #include <linux/gpio.h>
> > #include <linux/platform_device.h>
> >+#include <linux/slab.h>
> 
> this is already included in line 32 of that file.
> 
> >diff --git a/drivers/cbus/retu-headset.c b/drivers/cbus/retu-headset.c
> >index e798bc2..645679c 100644
> >--- a/drivers/cbus/retu-headset.c
> >+++ b/drivers/cbus/retu-headset.c
> >@@ -25,6 +25,7 @@
> > #include <linux/delay.h>
> > #include <linux/input.h>
> > #include <linux/platform_device.h>
> >+#include <linux/slab.h>
> 
> already on line 25, right above #include <linux/delay.h>
> 
> >diff --git a/drivers/cbus/retu-user.c b/drivers/cbus/retu-user.c
> >index 0f35dc5..7bc97d4 100644
> >--- a/drivers/cbus/retu-user.c
> >+++ b/drivers/cbus/retu-user.c
> >@@ -33,6 +33,7 @@
> > #include <linux/spinlock.h>
> > #include <linux/sched.h>
> > #include <linux/mutex.h>
> >+#include <linux/slab.h>
> 
> already on line 26
> 
> >diff --git a/drivers/cbus/retu-wdt.c b/drivers/cbus/retu-wdt.c
> >index 35932dd..fda8b35 100644
> >--- a/drivers/cbus/retu-wdt.c
> >+++ b/drivers/cbus/retu-wdt.c
> >@@ -35,6 +35,7 @@
> > #include <linux/platform_device.h>
> > #include <linux/miscdevice.h>
> > #include <linux/watchdog.h>
> >+#include <linux/slab.h>
> 
> already on line 25
> 
> >diff --git a/drivers/cbus/tahvo-user.c b/drivers/cbus/tahvo-user.c
> >index c0e8daf..b28b015 100644
> >--- a/drivers/cbus/tahvo-user.c
> >+++ b/drivers/cbus/tahvo-user.c
> >@@ -33,6 +33,7 @@
> > #include <linux/spinlock.h>
> > #include <linux/sched.h>
> > #include <linux/mutex.h>
> >+#include <linux/slab.h>
> 
> already on line 26.
> 
> NAK to this patch.
> 
-- 
Carlos Chinea <carlos.chinea@nokia.com>