| Message ID | 20230307115900.2293120-2-u.kleine-koenig@pengutronix.de |
|---|---|
| State | Accepted |
| Commit | b4700ed86f00d1917f5219c861f425f92af1a7ef |
| Headers | show |
| Series | phy: Convert to platform remove callback returning void | expand |
Dne torek, 07. marec 2023 ob 12:58:30 CET je Uwe Kleine-König napisal(a): > The .remove() callback for a platform driver returns an int which makes > many driver authors wrongly assume it's possible to do error handling by > returning an error code. However the value returned is (mostly) ignored > and this typically results in resource leaks. To improve here there is a > quest to make the remove callback return void. In the first step of this > quest all drivers are converted to .remove_new() which already returns > void. > > Trivially convert this driver from always returning zero in the remove > callback to the void returning variant. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > --- Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > drivers/phy/allwinner/phy-sun4i-usb.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c > b/drivers/phy/allwinner/phy-sun4i-usb.c index fbcd7014ab43..6a74e5ce180a > 100644 > --- a/drivers/phy/allwinner/phy-sun4i-usb.c > +++ b/drivers/phy/allwinner/phy-sun4i-usb.c > @@ -698,7 +698,7 @@ static struct phy *sun4i_usb_phy_xlate(struct device > *dev, return data->phys[args->args[0]].phy; > } > > -static int sun4i_usb_phy_remove(struct platform_device *pdev) > +static void sun4i_usb_phy_remove(struct platform_device *pdev) > { > struct device *dev = &pdev->dev; > struct sun4i_usb_phy_data *data = dev_get_drvdata(dev); > @@ -711,8 +711,6 @@ static int sun4i_usb_phy_remove(struct platform_device > *pdev) devm_free_irq(dev, data->vbus_det_irq, data); > > cancel_delayed_work_sync(&data->detect); > - > - return 0; > } > > static const unsigned int sun4i_usb_phy0_cable[] = { > @@ -1054,7 +1052,7 @@ MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match); > > static struct platform_driver sun4i_usb_phy_driver = { > .probe = sun4i_usb_phy_probe, > - .remove = sun4i_usb_phy_remove, > + .remove_new = sun4i_usb_phy_remove, > .driver = { > .of_match_table = sun4i_usb_phy_of_match, > .name = "sun4i-usb-phy",
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index fbcd7014ab43..6a74e5ce180a 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -698,7 +698,7 @@ static struct phy *sun4i_usb_phy_xlate(struct device *dev, return data->phys[args->args[0]].phy; } -static int sun4i_usb_phy_remove(struct platform_device *pdev) +static void sun4i_usb_phy_remove(struct platform_device *pdev) { struct device *dev = &pdev->dev; struct sun4i_usb_phy_data *data = dev_get_drvdata(dev); @@ -711,8 +711,6 @@ static int sun4i_usb_phy_remove(struct platform_device *pdev) devm_free_irq(dev, data->vbus_det_irq, data); cancel_delayed_work_sync(&data->detect); - - return 0; } static const unsigned int sun4i_usb_phy0_cable[] = { @@ -1054,7 +1052,7 @@ MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match); static struct platform_driver sun4i_usb_phy_driver = { .probe = sun4i_usb_phy_probe, - .remove = sun4i_usb_phy_remove, + .remove_new = sun4i_usb_phy_remove, .driver = { .of_match_table = sun4i_usb_phy_of_match, .name = "sun4i-usb-phy",
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> --- drivers/phy/allwinner/phy-sun4i-usb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)