Skip to contentSkip to conversation

pinctrl: sirf: remove unnecessary platform_set_drvdata()

PATCH In review Jingoo Han 2 participants 2 messages May 6, 2013 – May 14, 2013 Pin control

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 3/4 pinctrl: sirf: remove unnecessary platform_set_drvdata()

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

---
 drivers/pinctrl/pinctrl-sirf.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/pinctrl/pinctrl-sirf.c +1 -4
index bc9d1be..d704f3b 100644
@@ -1280,9 +1280,8 @@ static int sirfsoc_pinmux_probe(struct platform_device *pdev)
 
 	spmx->gpio_virtbase = of_iomap(np, 0);
 	if (!spmx->gpio_virtbase) {
-		ret = -ENOMEM;
 		dev_err(&pdev->dev, "can't map gpio registers\n");
-		goto out_no_gpio_remap;
+		return -ENOMEM;
 	}
 
 	spmx->rsc_virtbase = sirfsoc_rsc_of_iomap();
@@ -1316,8 +1315,6 @@ out_no_pmx:
 	iounmap(spmx->rsc_virtbase);
 out_no_rsc_remap:
 	iounmap(spmx->gpio_virtbase);
-out_no_gpio_remap:
-	platform_set_drvdata(pdev, NULL);
 	return ret;
 }
 
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 6 lines · Jingoo Han

The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL.

Patch applied.

Thanks!
Linus Walleij