Skip to contentSkip to conversation

rtc: ab-b5ze-s3: remove .remove

PATCH In review Alexandre Belloni 2 participants 5 messages Oct 21, 2019 – Oct 22, 2019

Subsystems (3)
lore
Share & tools
lore

Alexandre Belloni

author maintainer
#0 lore raw

PATCH 1/4 rtc: ab-b5ze-s3: remove .remove

dpm_sysfs_remove() and device_pm_remove() are already called by device_del() on device removal so there is no need to call device_init_wakeup(dev, false) from the driver and it allows to remove the .remove callback.

---
 drivers/rtc/rtc-ab-b5ze-s3.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/rtc/rtc-ab-b5ze-s3.c +0 -11
index cdad6f00debf..811fe2005488 100644
@@ -900,16 +900,6 @@ static int abb5zes3_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int abb5zes3_remove(struct i2c_client *client)
-{
-	struct abb5zes3_rtc_data *rtc_data = dev_get_drvdata(&client->dev);
-
-	if (rtc_data->irq > 0)
-		device_init_wakeup(&client->dev, false);
-
-	return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int abb5zes3_rtc_suspend(struct device *dev)
 {
@@ -956,7 +946,6 @@ static struct i2c_driver abb5zes3_driver = {
 		.of_match_table = of_match_ptr(abb5zes3_dt_match),
 	},
 	.probe	  = abb5zes3_probe,
-	.remove	  = abb5zes3_remove,
 	.id_table = abb5zes3_id,
 };
 module_i2c_driver(abb5zes3_driver);
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH 2/4 rtc: lpc32xx: remove .remove

dpm_sysfs_remove() and device_pm_remove() are already called by device_del() on device removal so there is no need to call device_init_wakeup(dev, false) from the driver and it allows to remove the .remove callback.

---
 drivers/rtc/rtc-lpc32xx.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/rtc/rtc-lpc32xx.c +0 -11
index b6a0d4a182bf..15d8abda81fe 100644
@@ -264,16 +264,6 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int lpc32xx_rtc_remove(struct platform_device *pdev)
-{
-	struct lpc32xx_rtc *rtc = platform_get_drvdata(pdev);
-
-	if (rtc->irq >= 0)
-		device_init_wakeup(&pdev->dev, 0);
-
-	return 0;
-}
-
 #ifdef CONFIG_PM
 static int lpc32xx_rtc_suspend(struct device *dev)
 {
@@ -355,7 +345,6 @@ MODULE_DEVICE_TABLE(of, lpc32xx_rtc_match);
 
 static struct platform_driver lpc32xx_rtc_driver = {
 	.probe		= lpc32xx_rtc_probe,
-	.remove		= lpc32xx_rtc_remove,
 	.driver = {
 		.name	= "rtc-lpc32xx",
 		.pm	= LPC32XX_RTC_PM_OPS,
Signature · 1 line
2.21.0
author maintainer
#2 lore raw

PATCH 3/4 rtc: sirfsoc: remove .remove

In reply to Alexandre Belloni

dpm_sysfs_remove() and device_pm_remove() are already called by device_del() on device removal so there is no need to call device_init_wakeup(dev, false) from the driver and it allows to remove the .remove callback.

---
 drivers/rtc/rtc-sirfsoc.c | 8 --------
 1 file changed, 8 deletions(-)
drivers/rtc/rtc-sirfsoc.c +0 -8
index c759c55359a1..a2c9c55667cd 100644
@@ -365,13 +365,6 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int sirfsoc_rtc_remove(struct platform_device *pdev)
-{
-	device_init_wakeup(&pdev->dev, 0);
-
-	return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int sirfsoc_rtc_suspend(struct device *dev)
 {
@@ -450,7 +443,6 @@ static struct platform_driver sirfsoc_rtc_driver = {
 		.of_match_table = sirfsoc_rtc_of_match,
 	},
 	.probe = sirfsoc_rtc_probe,
-	.remove = sirfsoc_rtc_remove,
 };
 module_platform_driver(sirfsoc_rtc_driver);
 
Signature · 1 line
2.21.0
author maintainer
#3 lore raw

PATCH 4/4 rtc: sc27xx: remove .remove

In reply to Alexandre Belloni

dpm_sysfs_remove() and device_pm_remove() are already called by device_del() on device removal so there is no need to call device_init_wakeup(dev, false) from the driver and it allows to remove the .remove callback.

---
 drivers/rtc/rtc-sc27xx.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/rtc/rtc-sc27xx.c +0 -7
index b95676899750..36810dd40cd3 100644
@@ -661,12 +661,6 @@ static int sprd_rtc_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int sprd_rtc_remove(struct platform_device *pdev)
-{
-	device_init_wakeup(&pdev->dev, 0);
-	return 0;
-}
-
 static const struct of_device_id sprd_rtc_of_match[] = {
 	{ .compatible = "sprd,sc2731-rtc", },
 	{ },
@@ -679,7 +673,6 @@ static struct platform_driver sprd_rtc_driver = {
 		.of_match_table = sprd_rtc_of_match,
 	},
 	.probe	= sprd_rtc_probe,
-	.remove = sprd_rtc_remove,
 };
 module_platform_driver(sprd_rtc_driver);
 
Signature · 1 line
2.21.0
Reviewed-by on v1 4/4
#4 lore raw

Re: [PATCH 4/4] rtc: sc27xx: remove .remove

Quoted 5 lines · Alexandre Belloni

dpm_sysfs_remove() and device_pm_remove() are already called by device_del() on device removal so there is no need to call device_init_wakeup(dev, false) from the driver and it allows to remove the .remove callback.

Right, feel free to add my tag, thanks.

Quoted 34 lines
---
 drivers/rtc/rtc-sc27xx.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/rtc/rtc-sc27xx.c +0 -8
index b95676899750..36810dd40cd3 100644
@@ -661,12 +661,6 @@ static int sprd_rtc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int sprd_rtc_remove(struct platform_device *pdev)
-{
-       device_init_wakeup(&pdev->dev, 0);
-       return 0;
-}
-
 static const struct of_device_id sprd_rtc_of_match[] = {
        { .compatible = "sprd,sc2731-rtc", },
        { },
@@ -679,7 +673,6 @@ static struct platform_driver sprd_rtc_driver = {
                .of_match_table = sprd_rtc_of_match,
        },
        .probe  = sprd_rtc_probe,
-       .remove = sprd_rtc_remove,
 };
 module_platform_driver(sprd_rtc_driver);
 
--

2.21.0

Signature · 2 lines
Baolin Wang
Best Regards