On Thu, Nov 19, 2020 at 03:24:16PM +0000, Mark Brown wrote: > On Thu, Nov 19, 2020 at 04:20:57PM +0100, Uwe Kleine-König wrote: > > Consider an spi driver with a .probe but without a .remove callback (e.g. > > rtc-ds1347). The function spi_drv_probe() is called to bind a device and > > so some init routines like dev_pm_domain_attach() are used. As there is > > no remove callback spi_drv_remove() isn't called at unbind time however > > and so calling dev_pm_domain_detach() is missed and the pm domain keeps > > active. > > > To fix this always use either both or none of the functions and make > > them handle the callback not being set. > > Why would we want to tie configuring PM domains to either of these > functions? We certainly don't want to force drivers to have empty > remove functions to trigger cleanup of domains, this would be > counterintuitive and this stuff should be transparent to the driver.
Yes, I thought that this is not the final fix. I just sent the minimal
change to prevent the imbalance. So if I understand correctly, I will
have to respin with the following squashed into patch 1:
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 5bdc66f08ee1..5becf6c2c409 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -445,10 +445,8 @@ int __spi_register_driver(struct module *owner, struct
spi_driver *sdrv)
{
sdrv->driver.owner = owner;
sdrv->driver.bus = &spi_bus_type;
- if (sdrv->probe || sdrv->remove) {
- sdrv->driver.probe = spi_drv_probe;
- sdrv->driver.remove = spi_drv_remove;
- }
+ sdrv->driver.probe = spi_drv_probe;
+ sdrv->driver.remove = spi_drv_remove;
if (sdrv->shutdown)
sdrv->driver.shutdown = spi_drv_shutdown;
return driver_register(&sdrv->driver);
(Not sure this makes a difference in real life, are there drivers
without a .probe callback?)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
signature.asc
Description: PGP signature
