Commit 9efba202 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'bus_remove_return_void-5.15' of... 

Merge tag 'bus_remove_return_void-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

 into drm-next

Bus: Make remove callback return void tag

Tag for other trees/branches to pull from in order to have a stable
place to build off of if they want to add new busses for 5.15.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

[airlied: fixed up merge conflict in drm]
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patchwork.freedesktop.org/patch/msgid/YPkwQwf0dUKnGA7L@kroah.com
parents 49f7844b fc7a6209

arch/arm/common/locomo.c

+1 −2
Original line number Diff line number Diff line
@@ -834,14 +834,13 @@ static int locomo_bus_probe(struct device *dev) 
	return ret;

}



static int locomo_bus_remove(struct device *dev)

static void locomo_bus_remove(struct device *dev)

{

	struct locomo_dev *ldev = LOCOMO_DEV(dev);

	struct locomo_driver *drv = LOCOMO_DRV(dev->driver);



	if (drv->remove)

		drv->remove(ldev);

	return 0;

}



struct bus_type locomo_bus_type = {

arch/arm/common/sa1111.c

+1 −3
Original line number Diff line number Diff line
@@ -1364,15 +1364,13 @@ static int sa1111_bus_probe(struct device *dev) 
	return ret;

}



static int sa1111_bus_remove(struct device *dev)

static void sa1111_bus_remove(struct device *dev)

{

	struct sa1111_dev *sadev = to_sa1111_device(dev);

	struct sa1111_driver *drv = SA1111_DRV(dev->driver);



	if (drv->remove)

		drv->remove(sadev);



	return 0;

}



struct bus_type sa1111_bus_type = {

arch/arm/mach-rpc/ecard.c

+1 −3
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ static int ecard_drv_probe(struct device *dev) 
	return ret;

}



static int ecard_drv_remove(struct device *dev)

static void ecard_drv_remove(struct device *dev)

{

	struct expansion_card *ec = ECARD_DEV(dev);

	struct ecard_driver *drv = ECARD_DRV(dev->driver);
@@ -1067,8 +1067,6 @@ static int ecard_drv_remove(struct device *dev) 
	ec->ops = &ecard_default_ops;

	barrier();

	ec->irq_data = NULL;



	return 0;

}



/*

arch/mips/sgi-ip22/ip22-gio.c

+1 −2
Original line number Diff line number Diff line
@@ -143,14 +143,13 @@ static int gio_device_probe(struct device *dev) 
	return error;

}



static int gio_device_remove(struct device *dev)

static void gio_device_remove(struct device *dev)

{

	struct gio_device *gio_dev = to_gio_device(dev);

	struct gio_driver *drv = to_gio_driver(dev->driver);



	if (dev->driver && drv->remove)

		drv->remove(gio_dev);

	return 0;

}



static void gio_device_shutdown(struct device *dev)

arch/parisc/kernel/drivers.c

+2 −3
Original line number Diff line number Diff line
@@ -133,14 +133,13 @@ static int parisc_driver_probe(struct device *dev) 
	return rc;

}



static int __exit parisc_driver_remove(struct device *dev)

static void __exit parisc_driver_remove(struct device *dev)

{

	struct parisc_device *pa_dev = to_parisc_device(dev);

	struct parisc_driver *pa_drv = to_parisc_driver(dev->driver);



	if (pa_drv->remove)

		pa_drv->remove(pa_dev);



	return 0;

}