aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/cs.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-11-01 06:46:06 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2008-11-02 09:05:51 -0500
commit2509698687e2d8265a19d800f7daa6f87790a529 (patch)
tree1973afe1d18c08db899ed1c558a36abfd1d050c4 /drivers/pcmcia/cs.c
parent3e879f61434632ca099804713099f8f1627f929e (diff)
pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs.c')
-rw-r--r--drivers/pcmcia/cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index c68c5d338285..5d0e60e09d31 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -226,7 +226,7 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
226 /* set proper values in socket->dev */ 226 /* set proper values in socket->dev */
227 dev_set_drvdata(&socket->dev, socket); 227 dev_set_drvdata(&socket->dev, socket);
228 socket->dev.class = &pcmcia_socket_class; 228 socket->dev.class = &pcmcia_socket_class;
229 snprintf(socket->dev.bus_id, BUS_ID_SIZE, "pcmcia_socket%u", socket->sock); 229 dev_set_name(&socket->dev, "pcmcia_socket%u", socket->sock);
230 230
231 /* base address = 0, map = 0 */ 231 /* base address = 0, map = 0 */
232 socket->cis_mem.flags = 0; 232 socket->cis_mem.flags = 0;