diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 10:44:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 10:44:34 -0800 |
| commit | 40f91de6a1d65a2d0ce8bc296ed0a2d53d63c845 (patch) | |
| tree | 5feb71564431547b20cb786ae5365a1f83b227ff /drivers/w1/w1_int.c | |
| parent | 2a678cc53977c97aaf666c338f6312b7bbd3406d (diff) | |
| download | linux-3.10-40f91de6a1d65a2d0ce8bc296ed0a2d53d63c845.tar.gz linux-3.10-40f91de6a1d65a2d0ce8bc296ed0a2d53d63c845.tar.bz2 linux-3.10-40f91de6a1d65a2d0ce8bc296ed0a2d53d63c845.zip | |
w1: struct device - replace bus_id with dev_name(), dev_set_name()
CC: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/w1/w1_int.c')
| -rw-r--r-- | drivers/w1/w1_int.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index a3a54567bfb..4a46ed58ece 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c @@ -75,8 +75,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, mutex_init(&dev->mutex); memcpy(&dev->dev, device, sizeof(struct device)); - snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), - "w1_bus_master%u", dev->id); + dev_set_name(&dev->dev, "w1_bus_master%u", dev->id); snprintf(dev->name, sizeof(dev->name), "w1_bus_master%u", dev->id); dev->driver = driver; |