[PATCH] pcmcia: rename PCMCIA devices

As per the default usage in the driver model, don't embed the bus name into
the device name

Signed-off-by: Dominik Brodowski <linux@brodo.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index be2f81e07657d6caca20a578f3e2b2d0f2afa293..78857f9f0cac63d84047f039ce15633fd062fb36 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -600,7 +600,7 @@ static int bind_request(struct pcmcia_bus_socket *s, bind_info_t *bind_info)
        p_dev->dev.bus = &pcmcia_bus_type;
        p_dev->dev.parent = s->parent->dev.dev;
        p_dev->dev.release = pcmcia_release_dev;
-       sprintf (p_dev->dev.bus_id, "pcmcia%d.%d", p_dev->socket->sock, p_dev->device_no);
+       sprintf (p_dev->dev.bus_id, "%d.%d", p_dev->socket->sock, p_dev->device_no);
        p_dev->dev.driver = &p_drv->drv;
 
        /* compat */