Commit 4b024225 authored by YueHaibing's avatar YueHaibing Committed by Linus Walleij
Browse files

pinctrl: use devm_platform_ioremap_resource() to simplify code 



devm_platform_ioremap_resource() internally have platform_get_resource()
and devm_ioremap_resource() in it. So instead of calling them separately
use devm_platform_ioremap_resource() directly.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Acked-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Acked-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20191104142654.39256-1-yuehaibing@huawei.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 6e4f3db8

drivers/pinctrl/actions/pinctrl-owl.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -915,7 +915,6 @@ static int owl_gpio_init(struct owl_pinctrl *pctrl) 
int owl_pinctrl_probe(struct platform_device *pdev,

int owl_pinctrl_probe(struct platform_device *pdev,

				struct owl_pinctrl_soc_data *soc_data)

				struct owl_pinctrl_soc_data *soc_data)

{

{

	struct resource *res;

	struct owl_pinctrl *pctrl;

	struct owl_pinctrl *pctrl;

	int ret, i;

	int ret, i;
@@ -923,8 +922,7 @@ int owl_pinctrl_probe(struct platform_device *pdev, 
	if (!pctrl)

	if (!pctrl)

		return -ENOMEM;

		return -ENOMEM;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pctrl->base = devm_platform_ioremap_resource(pdev, 0);

	pctrl->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pctrl->base))

	if (IS_ERR(pctrl->base))

		return PTR_ERR(pctrl->base);

		return PTR_ERR(pctrl->base);

drivers/pinctrl/bcm/pinctrl-bcm281xx.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1400,12 +1400,10 @@ static struct pinctrl_desc bcm281xx_pinctrl_desc = { 
static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev)

static int __init bcm281xx_pinctrl_probe(struct platform_device *pdev)

{

{

	struct bcm281xx_pinctrl_data *pdata = &bcm281xx_pinctrl;

	struct bcm281xx_pinctrl_data *pdata = &bcm281xx_pinctrl;

	struct resource *res;

	struct pinctrl_dev *pctl;

	struct pinctrl_dev *pctl;





	/* So far We can assume there is only 1 bank of registers */

	/* So far We can assume there is only 1 bank of registers */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pdata->reg_base = devm_platform_ioremap_resource(pdev, 0);

	pdata->reg_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pdata->reg_base)) {

	if (IS_ERR(pdata->reg_base)) {

		dev_err(&pdev->dev, "Failed to ioremap MEM resource\n");

		dev_err(&pdev->dev, "Failed to ioremap MEM resource\n");

		return -ENODEV;

		return -ENODEV;

drivers/pinctrl/bcm/pinctrl-cygnus-mux.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -940,7 +940,6 @@ static int cygnus_mux_log_init(struct cygnus_pinctrl *pinctrl) 
static int cygnus_pinmux_probe(struct platform_device *pdev)

static int cygnus_pinmux_probe(struct platform_device *pdev)

{

{

	struct cygnus_pinctrl *pinctrl;

	struct cygnus_pinctrl *pinctrl;

	struct resource *res;

	int i, ret;

	int i, ret;

	struct pinctrl_pin_desc *pins;

	struct pinctrl_pin_desc *pins;

	unsigned num_pins = ARRAY_SIZE(cygnus_pins);

	unsigned num_pins = ARRAY_SIZE(cygnus_pins);
@@ -953,15 +952,13 @@ static int cygnus_pinmux_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, pinctrl);

	platform_set_drvdata(pdev, pinctrl);

	spin_lock_init(&pinctrl->lock);

	spin_lock_init(&pinctrl->lock);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pinctrl->base0 = devm_platform_ioremap_resource(pdev, 0);

	pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pinctrl->base0)) {

	if (IS_ERR(pinctrl->base0)) {

		dev_err(&pdev->dev, "unable to map I/O space\n");

		dev_err(&pdev->dev, "unable to map I/O space\n");

		return PTR_ERR(pinctrl->base0);

		return PTR_ERR(pinctrl->base0);

	}

	}





	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	pinctrl->base1 = devm_platform_ioremap_resource(pdev, 1);

	pinctrl->base1 = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pinctrl->base1)) {

	if (IS_ERR(pinctrl->base1)) {

		dev_err(&pdev->dev, "unable to map I/O space\n");

		dev_err(&pdev->dev, "unable to map I/O space\n");

		return PTR_ERR(pinctrl->base1);

		return PTR_ERR(pinctrl->base1);

drivers/pinctrl/bcm/pinctrl-iproc-gpio.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -803,8 +803,7 @@ static int iproc_gpio_probe(struct platform_device *pdev) 
	chip->dev = dev;

	chip->dev = dev;

	platform_set_drvdata(pdev, chip);

	platform_set_drvdata(pdev, chip);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	chip->base = devm_platform_ioremap_resource(pdev, 0);

	chip->base = devm_ioremap_resource(dev, res);

	if (IS_ERR(chip->base)) {

	if (IS_ERR(chip->base)) {

		dev_err(dev, "unable to map I/O memory\n");

		dev_err(dev, "unable to map I/O memory\n");

		return PTR_ERR(chip->base);

		return PTR_ERR(chip->base);

drivers/pinctrl/bcm/pinctrl-ns2-mux.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -1042,8 +1042,7 @@ static int ns2_pinmux_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, pinctrl);

	platform_set_drvdata(pdev, pinctrl);

	spin_lock_init(&pinctrl->lock);

	spin_lock_init(&pinctrl->lock);





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pinctrl->base0 = devm_platform_ioremap_resource(pdev, 0);

	pinctrl->base0 = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pinctrl->base0))

	if (IS_ERR(pinctrl->base0))

		return PTR_ERR(pinctrl->base0);

		return PTR_ERR(pinctrl->base0);
@@ -1057,8 +1056,7 @@ static int ns2_pinmux_probe(struct platform_device *pdev) 
		return -ENOMEM;

		return -ENOMEM;

	}

	}





	res = platform_get_resource(pdev, IORESOURCE_MEM, 2);

	pinctrl->pinconf_base = devm_platform_ioremap_resource(pdev, 2);

	pinctrl->pinconf_base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(pinctrl->pinconf_base))

	if (IS_ERR(pinctrl->pinconf_base))

		return PTR_ERR(pinctrl->pinconf_base);

		return PTR_ERR(pinctrl->pinconf_base);

CRA Git | Maintained and supported by SUSTech CRA and CCSE