Commit 8142a46c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7bbb79ff

Documentation/driver-api/auxiliary_bus.rst

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

drivers/base/auxiliary.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

include/linux/auxiliary_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE