Skip to contentSkip to conversation

jz4740-battery: remove unnecessary platform_set_drvdata()

PATCH In review Jingoo Han 1 participant 1 message May 6, 2013

lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 6/8 jz4740-battery: 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/power/jz4740-battery.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/power/jz4740-battery.c +1 -3
index c675553..d9686aa 100644
@@ -292,7 +292,7 @@ static int jz_battery_probe(struct platform_device *pdev)
 			jz_battery);
 	if (ret) {
 		dev_err(&pdev->dev, "Failed to request irq %d\n", ret);
-		goto err;
+		return ret;
 	}
 	disable_irq(jz_battery->irq);
 
@@ -349,8 +349,6 @@ err_free_gpio:
 		gpio_free(jz_battery->pdata->gpio_charge);
 err_free_irq:
 	free_irq(jz_battery->irq, jz_battery);
-err:
-	platform_set_drvdata(pdev, NULL);
 	return ret;
 }
 
Signature · 1 line
1.7.2.5