From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932377Ab0JEMCF (ORCPT ); Tue, 5 Oct 2010 08:02:05 -0400 Received: from eu1sys200aog111.obsmtp.com ([207.126.144.131]:34647 "EHLO eu1sys200aog111.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757085Ab0JEMBx (ORCPT ); Tue, 5 Oct 2010 08:01:53 -0400 From: Arun Murthy To: , , , , , , , , , , Cc: , , , , , Subject: [PATCHv2 3/7] leds: pwm: add a new element 'name' to platform data Date: Tue, 5 Oct 2010 17:29:58 +0530 Message-ID: <1286280002-1636-4-git-send-email-arun.murthy@stericsson.com> X-Mailer: git-send-email 1.7.2.dirty In-Reply-To: <1286280002-1636-1-git-send-email-arun.murthy@stericsson.com> References: <1286280002-1636-1-git-send-email-arun.murthy@stericsson.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Linus Walleij --- 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