summaryrefslogtreecommitdiffstats
path: root/drivers/w1
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2015-03-16 12:59:34 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2015-03-17 07:24:50 +0100
commite0899dfa3b15886d35280199e2dbd2d7810bf8b5 (patch)
tree195573943ed1cfdec389330e08049de9d271ed45 /drivers/w1
parent0f3366ba853dafc6c2005771bcd1a97769f764dd (diff)
downloadbarebox-e0899dfa3b15886d35280199e2dbd2d7810bf8b5.tar.gz
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>
Diffstat (limited to 'drivers/w1')
-rw-r--r--drivers/w1/w1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
index bbef470..ff57386 100644
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -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= {