lkml.org 
[lkml]   [2010]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv3 3/7] leds: pwm: add a new element 'name' to platform data
    Date
    A new element 'name' is added to pwm led platform data structure.
    This is required to identify the pwm device.

    Signed-off-by: Arun Murthy <arun.murthy@stericsson.com>
    Acked-by: Linus Walleij <linus.walleij@stericsson.com>
    ---
    drivers/leds/leds-pwm.c | 4 +++-
    include/linux/leds_pwm.h | 3 ++-
    2 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c
    index da3fa8d..8da2be6 100644
    --- a/drivers/leds/leds-pwm.c
    +++ b/drivers/leds/leds-pwm.c
    @@ -66,8 +66,10 @@ static int led_pwm_probe(struct platform_device *pdev)
    cur_led = &pdata->leds[i];
    led_dat = &leds_data[i];

    + if (!pdata->name)
    + pdata->name = cur_led->name;
    led_dat->pwm = pwm_request(cur_led->pwm_id,
    - cur_led->name);
    + pdata->name);
    if (IS_ERR(led_dat->pwm)) {
    dev_err(&pdev->dev, "unable to request PWM %d\n",
    cur_led->pwm_id);
    diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h
    index 33a0711..dbc925a 100644
    --- a/include/linux/leds_pwm.h
    +++ b/include/linux/leds_pwm.h
    @@ -14,8 +14,9 @@ struct led_pwm {
    };

    struct led_pwm_platform_data {
    - int num_leds;
    + int num_leds;
    struct led_pwm *leds;
    + char *name;
    };

    #endif
    --
    1.7.2.dirty


    \
     
     \ /
      Last update: 2010-10-06 18:03    [W:0.107 / U:0.372 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site