9
0
Fork 0

driver: Call remove function only when available

The bus implementations currently call the drivers remove
hook unconditionally, but this hook is seldomly populated. Only call
it when it's actually populated.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2015-03-16 12:59:34 +01:00
parent 0f3366ba85
commit e0899dfa3b
6 changed files with 12 additions and 6 deletions

View File

@ -328,7 +328,8 @@ static void efi_bus_remove(struct device_d *dev)
struct efi_driver *efidrv = to_efi_driver(dev->driver);
struct efi_device *efidev = to_efi_device(dev);
return efidrv->remove(efidev);
if (efidrv->remove)
efidrv->remove(efidev);
}
struct bus_type efi_bus = {

View File

@ -29,7 +29,8 @@ static int platform_probe(struct device_d *dev)
static void platform_remove(struct device_d *dev)
{
dev->driver->remove(dev);
if (dev->driver->remove)
dev->driver->remove(dev);
}
int platform_driver_register(struct driver_d *drv)

View File

@ -472,7 +472,8 @@ static int i2c_probe(struct device_d *dev)
static void i2c_remove(struct device_d *dev)
{
dev->driver->remove(dev);
if (dev->driver->remove)
dev->driver->remove(dev);
}
struct bus_type i2c_bus = {

View File

@ -51,7 +51,8 @@ static void pci_remove(struct device_d *dev)
struct pci_dev *pdev = to_pci_dev(dev);
struct pci_driver *pdrv = to_pci_driver(dev->driver);
pdrv->remove(pdev);
if (pdrv->remove)
pdrv->remove(pdev);
}
struct bus_type pci_bus = {

View File

@ -311,7 +311,8 @@ static int spi_probe(struct device_d *dev)
static void spi_remove(struct device_d *dev)
{
dev->driver->remove(dev);
if (dev->driver->remove)
dev->driver->remove(dev);
}
struct bus_type spi_bus = {

View File

@ -392,7 +392,8 @@ static void w1_bus_remove(struct device_d *_dev)
struct w1_driver *drv = to_w1_driver(_dev->driver);
struct w1_device *dev = to_w1_device(_dev);
return drv->remove(dev);
if (drv->remove)
drv->remove(dev);
}
struct bus_type w1_bustype= {