From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: Re: [PATCH v2 1/3] leds: leds-pwm: Convert to use devm_get_pwm Date: Mon, 3 Dec 2012 15:13:37 +0100 Message-ID: <50BCB391.1070305@ti.com> References: <1352731270-27534-1-git-send-email-peter.ujfalusi@ti.com> <1352731270-27534-2-git-send-email-peter.ujfalusi@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Bryan Wu Cc: Richard Purdie , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org List-Id: devicetree@vger.kernel.org Hi Bryan, On 11/14/2012 02:14 AM, Bryan Wu wrote: > On Mon, Nov 12, 2012 at 6:41 AM, Peter Ujfalusi wrote: >> Update the driver to use the new API for requesting pwm so we can ta= ke >> advantage of the pwm_lookup table to find the correct pwm to be used= for the >> LED functionality. >> If the devm_get_pwm fails we fall back to legacy mode to try to get = the pwm. >> >> Signed-off-by: Peter Ujfalusi >> --- >> drivers/leds/leds-pwm.c | 19 ++++++------------- >> include/linux/leds_pwm.h | 2 +- >> 2 files changed, 7 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c >> index f2e44c7..c953c75 100644 >> --- a/drivers/leds/leds-pwm.c >> +++ b/drivers/leds/leds-pwm.c >> @@ -67,12 +67,11 @@ static int led_pwm_probe(struct platform_device = *pdev) >> cur_led =3D &pdata->leds[i]; >> led_dat =3D &leds_data[i]; >> >> - led_dat->pwm =3D pwm_request(cur_led->pwm_id, >> - cur_led->name); >> + led_dat->pwm =3D devm_pwm_get(&pdev->dev, cur_led->n= ame); >> if (IS_ERR(led_dat->pwm)) { >> ret =3D PTR_ERR(led_dat->pwm); >> - dev_err(&pdev->dev, "unable to request PWM %= d\n", >> - cur_led->pwm_id); >> + dev_err(&pdev->dev, "unable to request PWM f= or %s\n", >> + cur_led->name); >> goto err; >> } >> >> @@ -86,10 +85,8 @@ static int led_pwm_probe(struct platform_device *= pdev) >> led_dat->cdev.flags |=3D LED_CORE_SUSPENDRESUME; >> >> ret =3D led_classdev_register(&pdev->dev, &led_dat->= cdev); >> - if (ret < 0) { >> - pwm_free(led_dat->pwm); >> + if (ret < 0) >> goto err; >> - } >> } >> >> platform_set_drvdata(pdev, leds_data); >> @@ -98,10 +95,8 @@ static int led_pwm_probe(struct platform_device *= pdev) >> >> err: >> if (i > 0) { >> - for (i =3D i - 1; i >=3D 0; i--) { >> + for (i =3D i - 1; i >=3D 0; i--) >> led_classdev_unregister(&leds_data[i].cdev); >> - pwm_free(leds_data[i].pwm); >> - } >> } >> >> return ret; >> @@ -115,10 +110,8 @@ static int __devexit led_pwm_remove(struct plat= form_device *pdev) >> >> leds_data =3D platform_get_drvdata(pdev); >> >> - for (i =3D 0; i < pdata->num_leds; i++) { >> + for (i =3D 0; i < pdata->num_leds; i++) >> led_classdev_unregister(&leds_data[i].cdev); >> - pwm_free(leds_data[i].pwm); >> - } >> >> return 0; >> } >> diff --git a/include/linux/leds_pwm.h b/include/linux/leds_pwm.h >> index 33a0711..a65e964 100644 >> --- a/include/linux/leds_pwm.h >> +++ b/include/linux/leds_pwm.h >> @@ -7,7 +7,7 @@ >> struct led_pwm { >> const char *name; >> const char *default_trigger; >> - unsigned pwm_id; >> + unsigned pwm_id __deprecated; >=20 > I suggest we remove this later, we can provide patches from this from > platform data of board file. And I think this patch is good for me to > merge, will do it soon. I have marked the pwm_id as deprecated for now to allow one kernel cycl= e for external (?) drivers to adopt. We can remove it for 3.9 I think. I just checked linux-next today and this series is still not there. Do = you want me to resend it for you? I can rebase the patches on top of linux-= next or if you have preference on which tree should I use please let me know. >=20 > Thanks, > -Bryan >=20 >> u8 active_low; >> unsigned max_brightness; >> unsigned pwm_period_ns; >> -- >> 1.8.0 >> Thanks, P=E9ter