Commit 359164fa authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

pinctrl: cherryview: Utilize temporary variable to hold device pointer 



By one of the previous clean up change we got a temporary variable to hold
a device pointer. It can be utilized in other calls in the ->probe() and
save a bit of LOCs.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent 3ea2e2ca

drivers/pinctrl/intel/pinctrl-cherryview.c

+5 −6
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev) 
	if (!pctrl)

		return -ENOMEM;



	pctrl->dev = &pdev->dev;

	pctrl->dev = dev;

	pctrl->soc = soc_data;



	pctrl->ncommunities = pctrl->soc->ncommunities;
@@ -1668,14 +1668,13 @@ static int chv_pinctrl_probe(struct platform_device *pdev) 
		return irq;



	pctrl->pctldesc = chv_pinctrl_desc;

	pctrl->pctldesc.name = dev_name(&pdev->dev);

	pctrl->pctldesc.name = dev_name(dev);

	pctrl->pctldesc.pins = pctrl->soc->pins;

	pctrl->pctldesc.npins = pctrl->soc->npins;



	pctrl->pctldev = devm_pinctrl_register(&pdev->dev, &pctrl->pctldesc,

					       pctrl);

	pctrl->pctldev = devm_pinctrl_register(dev, &pctrl->pctldesc, pctrl);

	if (IS_ERR(pctrl->pctldev)) {

		dev_err(&pdev->dev, "failed to register pinctrl driver\n");

		dev_err(dev, "failed to register pinctrl driver\n");

		return PTR_ERR(pctrl->pctldev);

	}
@@ -1688,7 +1687,7 @@ static int chv_pinctrl_probe(struct platform_device *pdev) 
					chv_pinctrl_mmio_access_handler,

					NULL, pctrl);

	if (ACPI_FAILURE(status))

		dev_err(&pdev->dev, "failed to install ACPI addr space handler\n");

		dev_err(dev, "failed to install ACPI addr space handler\n");



	platform_set_drvdata(pdev, pctrl);