diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2008-10-30 01:36:48 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 10:44:31 -0800 |
| commit | 1e0b2cf933ebf32494eba3f668859ba57f06a951 (patch) | |
| tree | b8d9a3b41a452fb922cd3425e67ea8278c128c70 /drivers/base/firmware_class.c | |
| parent | 210272a28465a7a31bcd580d2f9529f924965aa5 (diff) | |
| download | linux-stable-1e0b2cf933ebf32494eba3f668859ba57f06a951.tar.gz linux-stable-1e0b2cf933ebf32494eba3f668859ba57f06a951.tar.bz2 linux-stable-1e0b2cf933ebf32494eba3f668859ba57f06a951.zip | |
driver core: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/firmware_class.c')
| -rw-r--r-- | drivers/base/firmware_class.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index b7e571031ecd..44699d9dd85c 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -291,12 +291,6 @@ firmware_class_timeout(u_long data) fw_load_abort(fw_priv); } -static inline void fw_setup_device_id(struct device *f_dev, struct device *dev) -{ - /* XXX warning we should watch out for name collisions */ - strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE); -} - static int fw_register_device(struct device **dev_p, const char *fw_name, struct device *device) { @@ -321,7 +315,7 @@ static int fw_register_device(struct device **dev_p, const char *fw_name, fw_priv->timeout.data = (u_long) fw_priv; init_timer(&fw_priv->timeout); - fw_setup_device_id(f_dev, device); + dev_set_name(f_dev, dev_name(device)); f_dev->parent = device; f_dev->class = &firmware_class; dev_set_drvdata(f_dev, fw_priv); |