driver core: auxiliary bus: make remove function return void

There's an effort to move the remove() callback in the driver core to
not return an int, as nothing can be done if this function fails.  To
make that effort easier, make the aux bus remove function void to start
with so that no users have to be changed sometime in the future.

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Ertman <david.m.ertman@intel.com>
Cc: Fred Oh <fred.oh@linux.intel.com>
Cc: Kiran Patil <kiran.patil@intel.com>
Cc: Leon Romanovsky <leonro@nvidia.com>
Cc: Martin Habets <mhabets@solarflare.com>
Cc: Parav Pandit <parav@mellanox.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Cc: Shiraz Saleem <shiraz.saleem@intel.com>
Link: https://lore.kernel.org/r/X8ohB1ks1NK7kPop@kroah.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/driver-api/auxiliary_bus.rst b/Documentation/driver-api/auxiliary_bus.rst
index 5dd7804631ef760fa9ad71a1b6f15743114291e8..2312506b067404b5cc52ed535dc02a593cd3b583 100644 (file)
--- a/Documentation/driver-api/auxiliary_bus.rst
+++ b/Documentation/driver-api/auxiliary_bus.rst
@@ -150,7 +150,7 @@ and shutdown notifications using the standard conventions.
        struct auxiliary_driver {
                int (*probe)(struct auxiliary_device *,
                              const struct auxiliary_device_id *id);
-               int (*remove)(struct auxiliary_device *);
+               void (*remove)(struct auxiliary_device *);
                void (*shutdown)(struct auxiliary_device *);
                int (*suspend)(struct auxiliary_device *, pm_message_t);
                int (*resume)(struct auxiliary_device *);

diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c
index eca36d6284d07dca3f38f8b9bed6797aeb6dc918..c44e85802b43c8c5597a0b04c1704ab7e8a4d960 100644 (file)
--- a/drivers/base/auxiliary.c
+++ b/drivers/base/auxiliary.c
@@ -82,13 +82,12 @@ static int auxiliary_bus_remove(struct device *dev)
 {
        struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver);
        struct auxiliary_device *auxdev = to_auxiliary_dev(dev);
-       int ret = 0;
 
        if (auxdrv->remove)
-               ret = auxdrv->remove(auxdev);
+               auxdrv->remove(auxdev);
        dev_pm_domain_detach(dev, true);
 
-       return ret;
+       return 0;
 }
 
 static void auxiliary_bus_shutdown(struct device *dev)

diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h
index 3580743d0e8d271382e816686f75b7ca10e38de2..d67b1760621065b174ae273a750db32e610c7bfc 100644 (file)
--- a/include/linux/auxiliary_bus.h
+++ b/include/linux/auxiliary_bus.h
@@ -19,7 +19,7 @@ struct auxiliary_device {
 
 struct auxiliary_driver {
        int (*probe)(struct auxiliary_device *auxdev, const struct auxiliary_device_id *id);
-       int (*remove)(struct auxiliary_device *auxdev);
+       void (*remove)(struct auxiliary_device *auxdev);
        void (*shutdown)(struct auxiliary_device *auxdev);
        int (*suspend)(struct auxiliary_device *auxdev, pm_message_t state);
        int (*resume)(struct auxiliary_device *auxdev);