Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

firewire: remove support of fw_driver.driver.probe and .remove methods

After all IEEE 1394 high-level drivers being converted to bus-specific
.probe/.remove methods, remove support of the obsolete generic methods.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

+2 -8
+2 -8
drivers/firewire/core-device.c
··· 194 194 struct fw_driver *driver = 195 195 container_of(dev->driver, struct fw_driver, driver); 196 196 197 - if (driver->probe) 198 - return driver->probe(fw_unit(dev), unit_match(dev, dev->driver)); 199 - else 200 - return driver->driver.probe(dev); 197 + return driver->probe(fw_unit(dev), unit_match(dev, dev->driver)); 201 198 } 202 199 203 200 static int fw_unit_remove(struct device *dev) ··· 202 205 struct fw_driver *driver = 203 206 container_of(dev->driver, struct fw_driver, driver); 204 207 205 - if (driver->remove) 206 - return driver->remove(fw_unit(dev)), 0; 207 - else 208 - return driver->driver.remove(dev); 208 + return driver->remove(fw_unit(dev)), 0; 209 209 } 210 210 211 211 static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)