pwm: jz4740: Pass device to clk_get()
Subsystems (2)
PATCH RESEND 1/2 pwm: jz4740: Pass device to clk_get()
In preparation to switching the jz4740 clk driver to the common clk framework make sure to pass the device to clk_get().
Signed-off-by Lars-Peter Clausen <[email protected]>
--- drivers/pwm/pwm-jz4740.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-jz4740.c +1 -1
@@ -171,7 +171,7 @@ static int jz4740_pwm_probe(struct platform_device *pdev)if (!jz4740)return -ENOMEM ; - jz4740->clk =clk_get (NULL ,"ext" ); + jz4740->clk =clk_get (&pdev->dev,"ext" );if (IS_ERR (jz4740->clk))return PTR_ERR (jz4740->clk);
Signature · 1 line
1.7.10.4
PATCH RESEND 2/2 pwm: jz4740: Use devm_clk_get()
Using the managed version of clk_get() makes the code a bit shorter and the error paths less complicated.
Signed-off-by Lars-Peter Clausen <[email protected]>
--- drivers/pwm/pwm-jz4740.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-)
drivers/pwm/pwm-jz4740.c +3 -17
@@ -165,13 +165,12 @@ static const struct pwm_ops jz4740_pwm_ops = {static int jz4740_pwm_probe (struct platform_device *pdev) {struct jz4740_pwm_chip *jz4740; -int ret; jz4740 =devm_kzalloc (&pdev->dev,sizeof (*jz4740),GFP_KERNEL );if (!jz4740)return -ENOMEM ; - jz4740->clk =clk_get (&pdev->dev,"ext" ); + jz4740->clk =devm_clk_get (&pdev->dev,"ext" );if (IS_ERR (jz4740->clk))return PTR_ERR (jz4740->clk);
@@ -180,29 +179,16 @@ static int jz4740_pwm_probe(struct platform_device *pdev) jz4740->chip.npwm =NUM_PWM ; jz4740->chip.base =-1 ; - ret =pwmchip_add (&jz4740->chip); -if (ret <0 ) { -clk_put (jz4740->clk); -return ret; - } -platform_set_drvdata (pdev, jz4740); -return 0 ; +return pwmchip_add (&jz4740->chip); }static int jz4740_pwm_remove (struct platform_device *pdev) {struct jz4740_pwm_chip *jz4740 =platform_get_drvdata (pdev); -int ret; - - ret =pwmchip_remove (&jz4740->chip); -if (ret <0 ) -return ret; -clk_put (jz4740->clk); - -return 0 ; +return pwmchip_remove (&jz4740->chip); }static struct platform_driver jz4740_pwm_driver = {
Signature · 1 line
1.7.10.4
Thierry Reding
AppliedRe: [PATCH resend 2/2] pwm: jz4740: Use devm_clk_get()
Quoted 7 lines · Lars-Peter Clausen
Using the managed version of
clk_get()makes the code a bit shorter and the error paths less complicated.Signed-off-by Lars-Peter Clausen <[email protected]>--- drivers/pwm/pwm-jz4740.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-)
Applied, thanks.
Thierry
Thierry Reding
AppliedQuoted 7 lines · Lars-Peter Clausen
In preparation to switching the jz4740 clk driver to the common clk framework make sure to pass the device to
clk_get().Signed-off-by Lars-Peter Clausen <[email protected]>--- drivers/pwm/pwm-jz4740.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks.
Thierry