Mailing List Archive: [PATCH -mmotm] backlight: fix adp8860

From: Randy Dunlap <randy.dunlap@oracle.com>

Add slab.h to fix part of build.
Add a parameter in backlight_device_register() call to fix part of build.

drivers/video/backlight/adp8860_bl.c:215: error: implicit declaration of function 'kzalloc'
drivers/video/backlight/adp8860_bl.c:215: warning: assignment makes pointer from integer without a cast
drivers/video/backlight/adp8860_bl.c:285: error: implicit declaration of function 'kfree'
drivers/video/backlight/adp8860_bl.c:673: warning: assignment makes pointer from integer without a cast
drivers/video/backlight/adp8860_bl.c:689: error: too few arguments to function 'backlight_device_register'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
---
drivers/video/backlight/adp8860_bl.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

--- mmotm-2010-0511-1820.orig/drivers/video/backlight/adp8860_bl.c
+++ mmotm-2010-0511-1820/drivers/video/backlight/adp8860_bl.c
@@ -16,6 +16,7 @@
#include <linux/fb.h>
#include <linux/backlight.h>
#include <linux/leds.h>
+#include <linux/slab.h>
#include <linux/workqueue.h>

#include <linux/i2c/adp8860.h>
@@ -647,6 +648,7 @@ static int __devinit adp8860_probe(struc
struct adp8860_bl *data;
struct adp8860_backlight_platform_data *pdata =
client->dev.platform_data;
+ struct backlight_properties props;
uint8_t reg_val;
int ret;

@@ -683,10 +685,13 @@ static int __devinit adp8860_probe(struc
data->current_brightness = 0;
i2c_set_clientdata(client, data);

+ memset(&props, 0, sizeof(props));
+ props.max_brightness = ADP8860_MAX_BRIGHTNESS;
+
mutex_init(&data->lock);

bl = backlight_device_register(dev_driver_string(&client->dev),
- &client->dev, data, &adp8860_bl_ops);
+ &client->dev, data, &adp8860_bl_ops, &props);
if (IS_ERR(bl)) {
dev_err(&client->dev, "failed to register backlight\n");
ret = PTR_ERR(bl);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Randy Dunlap wrote on 2010-05-12:
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Add slab.h to fix part of build. Add a parameter in
> backlight_device_register() call to fix part of build.
>
> drivers/video/backlight/adp8860_bl.c:215: error: implicit declaration
> of function 'kzalloc'
> drivers/video/backlight/adp8860_bl.c:215: warning: assignment makes
> pointer from integer without a cast
> drivers/video/backlight/adp8860_bl.c:285: error: implicit declaration
> of function 'kfree'
> drivers/video/backlight/adp8860_bl.c:673: warning: assignment makes
> pointer from integer without a cast
> drivers/video/backlight/adp8860_bl.c:689: error: too few arguments to
> function 'backlight_device_register'
>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> Cc: Michael Hennerich <michael.hennerich@analog.com>

Acked-by: Michael Hennerich <michael.hennerich@analog.com>

Thanks!

> ---
> drivers/video/backlight/adp8860_bl.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
> --- mmotm-2010-0511-1820.orig/drivers/video/backlight/adp8860_bl.c
> +++ mmotm-2010-0511-1820/drivers/video/backlight/adp8860_bl.c
> @@ -16,6 +16,7 @@
> #include <linux/fb.h> #include <linux/backlight.h> #include
> <linux/leds.h> +#include <linux/slab.h> #include <linux/workqueue.h>
>
> #include <linux/i2c/adp8860.h> @@ -647,6 +648,7 @@ static int __devinit
> adp8860_probe(struc struct adp8860_bl *data; struct
> adp8860_backlight_platform_data *pdata = client->dev.platform_data;
> + struct backlight_properties props; uint8_t reg_val; int ret;
> @@ -683,10 +685,13 @@ static int __devinit adp8860_probe(struc
> data->current_brightness = 0;
> i2c_set_clientdata(client, data);
> + memset(&props, 0, sizeof(props));
> + props.max_brightness = ADP8860_MAX_BRIGHTNESS;
> +
> mutex_init(&data->lock);
>
> bl = backlight_device_register(dev_driver_string(&client->dev),
> - &client->dev, data, &adp8860_bl_ops);
> + &client->dev, data, &adp8860_bl_ops, &props);
> if (IS_ERR(bl)) {
> dev_err(&client->dev, "failed to register backlight\n");
> ret = PTR_ERR(bl);

Greetings,
Michael

Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft Muenchen, Registergericht Muenchen HRB 4036 Geschaeftsfuehrer Thomas Wessel, William A. Martin, Margaret Seif

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/