sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/driver'

This commit is contained in:
Sascha Hauer 2015-04-13 12:57:12 +02:00
parent 909dbe5334 80264a8ac4
commit 4e1ac4a872
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/efi/efi/efi-device.c
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 = {

9
drivers/base/driver.c
View File

@ -85,14 +85,15 @@ int device_probe(struct device_d *dev)
pinctrl_select_state_default(dev);
list_add(&dev->active, &active);
ret = dev->bus->probe(dev);
if (ret) {
list_del(&dev->active);
dev_err(dev, "probe failed: %s\n", strerror(-ret));
return ret;
}
list_add(&dev->active, &active);
return 0;
}
@ -398,8 +399,8 @@ void devices_shutdown(void)
struct device_d *dev;
list_for_each_entry(dev, &active, active) {
if (dev->driver->remove)
dev->driver->remove(dev);
if (dev->bus->remove)
dev->bus->remove(dev);
}
}

3
drivers/base/platform.c
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)

3
drivers/i2c/i2c.c
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 = {

3
drivers/pci/bus.c
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 = {

3
drivers/spi/spi.c
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 = {

3
drivers/w1/w1.c
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= {