lkml.org 
[lkml]   [2011]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] leds: Fix warnings when PM is disabled for BD2802
On Fri, 21 Jan 2011 17:33:37 +0000
Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
> The suspend and resume functions will only be referenced when PM is
> enabled so they generate warnings due to being unreferenced and
> unexported.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>
> This is the more usual idiom for fixing this than the patch you added.
>
> drivers/leds/leds-bd2802.c | 30 ++++++++++++++++--------------
> 1 files changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c
> index 22152a2..ef0b868 100644
> --- a/drivers/leds/leds-bd2802.c
> +++ b/drivers/leds/leds-bd2802.c
> @@ -319,20 +319,6 @@ static void bd2802_turn_off(struct bd2802_led *led, enum led_ids id,
> bd2802_update_state(led, id, color, BD2802_OFF);
> }
>
> -static void bd2802_restore_state(struct bd2802_led *led)
> -{
> - int i;
> -
> - for (i = 0; i < LED_NUM; i++) {
> - if (led->led[i].r)
> - bd2802_turn_on(led, i, RED, led->led[i].r);
> - if (led->led[i].g)
> - bd2802_turn_on(led, i, GREEN, led->led[i].g);
> - if (led->led[i].b)
> - bd2802_turn_on(led, i, BLUE, led->led[i].b);
> - }
> -}
> -
> #define BD2802_SET_REGISTER(reg_addr, reg_name) \
> static ssize_t bd2802_store_reg##reg_addr(struct device *dev, \
> struct device_attribute *attr, const char *buf, size_t count) \
> @@ -761,6 +747,7 @@ static int __exit bd2802_remove(struct i2c_client *client)
> return 0;
> }
>
> +#ifdef CONFIG_PM_SLEEP
> static int bd2802_suspend(struct device *dev)
> {
> struct i2c_client *client = to_i2c_client(dev);
> @@ -771,6 +758,20 @@ static int bd2802_suspend(struct device *dev)
> return 0;
> }
>
> +static void bd2802_restore_state(struct bd2802_led *led)
> +{
> + int i;
> +
> + for (i = 0; i < LED_NUM; i++) {
> + if (led->led[i].r)
> + bd2802_turn_on(led, i, RED, led->led[i].r);
> + if (led->led[i].g)
> + bd2802_turn_on(led, i, GREEN, led->led[i].g);
> + if (led->led[i].b)
> + bd2802_turn_on(led, i, BLUE, led->led[i].b);
> + }
> +}
> +
> static int bd2802_resume(struct device *dev)
> {
> struct i2c_client *client = to_i2c_client(dev);
> @@ -783,6 +784,7 @@ static int bd2802_resume(struct device *dev)
>
> return 0;
> }
> +#endif
>

That rather sucks. It leaves an all-zeroes instance of dev_pm_ops
uselessly bloating the driver. And it leaves
bd2802_i2c_driver.driver.pm pointing at that all-zeroes instance of
dev_pm_ops, which is rather dangerous.

If CONFIG_PM_SLEEP=n, the .driver.pm field shouldn't exist at all.

<looks at Rafael>


\
 
 \ /
  Last update: 2011-01-21 23:17    [from the cache]
©2003-2011 Jasper Spaans