Use the new helper devm_platform_ioremap_resource() which wraps the
platform_get_resource() and devm_ioremap_resource() together, to
simplify the code.
Signed-off-by: Anson Huang <[email protected]>
---
- This is a resend version of patch: https://patchwork.kernel.org/patch/11048365/
---
drivers/pwm/pwm-mxs.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 04c0f6b..b14376b 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -126,15 +126,13 @@ static int mxs_pwm_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct mxs_pwm_chip *mxs;
- struct resource *res;
int ret;
mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
if (!mxs)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- mxs->base = devm_ioremap_resource(&pdev->dev, res);
+ mxs->base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(mxs->base))
return PTR_ERR(mxs->base);
--
2.7.4
On Tue, Sep 24, 2019 at 05:42:48PM +0800, Anson Huang wrote:
> Use the new helper devm_platform_ioremap_resource() which wraps the
> platform_get_resource() and devm_ioremap_resource() together, to
> simplify the code.
>
> Signed-off-by: Anson Huang <[email protected]>
> ---
> - This is a resend version of patch: https://patchwork.kernel.org/patch/11048365/
> ---
> drivers/pwm/pwm-mxs.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
When you do resend patches, please make sure to include an Reviewed-by
or Acked-by tags that you get.
In this case that's not necessary since I had already applied the other
patch.
Thierry
>
> diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
> index 04c0f6b..b14376b 100644
> --- a/drivers/pwm/pwm-mxs.c
> +++ b/drivers/pwm/pwm-mxs.c
> @@ -126,15 +126,13 @@ static int mxs_pwm_probe(struct platform_device *pdev)
> {
> struct device_node *np = pdev->dev.of_node;
> struct mxs_pwm_chip *mxs;
> - struct resource *res;
> int ret;
>
> mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
> if (!mxs)
> return -ENOMEM;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - mxs->base = devm_ioremap_resource(&pdev->dev, res);
> + mxs->base = devm_platform_ioremap_resource(pdev, 0);
> if (IS_ERR(mxs->base))
> return PTR_ERR(mxs->base);
>
> --
> 2.7.4
>
Add helper variable dev = &pdev->dev to simply the code.
Signed-off-by: Anson Huang <[email protected]>
---
drivers/pwm/pwm-mxs.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index b14376b..6255ffc 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -124,11 +124,12 @@ static const struct pwm_ops mxs_pwm_ops = {
static int mxs_pwm_probe(struct platform_device *pdev)
{
- struct device_node *np = pdev->dev.of_node;
+ struct device *dev = &pdev->dev;
+ struct device_node *np = dev->of_node;
struct mxs_pwm_chip *mxs;
int ret;
- mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
+ mxs = devm_kzalloc(dev, sizeof(*mxs), GFP_KERNEL);
if (!mxs)
return -ENOMEM;
@@ -136,23 +137,23 @@ static int mxs_pwm_probe(struct platform_device *pdev)
if (IS_ERR(mxs->base))
return PTR_ERR(mxs->base);
- mxs->clk = devm_clk_get(&pdev->dev, NULL);
+ mxs->clk = devm_clk_get(dev, NULL);
if (IS_ERR(mxs->clk))
return PTR_ERR(mxs->clk);
- mxs->chip.dev = &pdev->dev;
+ mxs->chip.dev = dev;
mxs->chip.ops = &mxs_pwm_ops;
mxs->chip.base = -1;
ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm);
if (ret < 0) {
- dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret);
+ dev_err(dev, "failed to get pwm number: %d\n", ret);
return ret;
}
ret = pwmchip_add(&mxs->chip);
if (ret < 0) {
- dev_err(&pdev->dev, "failed to add pwm chip %d\n", ret);
+ dev_err(dev, "failed to add pwm chip %d\n", ret);
return ret;
}
--
2.7.4