diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 13:44:38 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:44:38 -0500 |
commit | c85e37c51e7feecbe758e16ecaaa55cea1682e47 (patch) | |
tree | f1f126d91a5fc8194c7aab11d6ddab3a5895cdf7 /drivers/pnp/core.c | |
parent | ba88b0029fcdc39d23acd4d0e64b38145ffa4d5f (diff) |
pnp: 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/pnp/core.c')
-rw-r--r-- | drivers/pnp/core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index 16c01c6fa7c5..14814f231739 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c | |||
@@ -70,7 +70,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol) | |||
70 | spin_unlock(&pnp_lock); | 70 | spin_unlock(&pnp_lock); |
71 | 71 | ||
72 | protocol->number = nodenum; | 72 | protocol->number = nodenum; |
73 | sprintf(protocol->dev.bus_id, "pnp%d", nodenum); | 73 | dev_set_name(&protocol->dev, "pnp%d", nodenum); |
74 | return device_register(&protocol->dev); | 74 | return device_register(&protocol->dev); |
75 | } | 75 | } |
76 | 76 | ||
@@ -145,8 +145,7 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid | |||
145 | dev->dev.coherent_dma_mask = dev->dma_mask; | 145 | dev->dev.coherent_dma_mask = dev->dma_mask; |
146 | dev->dev.release = &pnp_release_device; | 146 | dev->dev.release = &pnp_release_device; |
147 | 147 | ||
148 | sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number, | 148 | dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); |
149 | dev->number); | ||
150 | 149 | ||
151 | dev_id = pnp_add_id(dev, pnpid); | 150 | dev_id = pnp_add_id(dev, pnpid); |
152 | if (!dev_id) { | 151 | if (!dev_id) { |