diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-20 14:35:12 -0400 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 04:23:15 -0400 |
commit | ded6a1a341cb38c4cfeb09d3d01ffe16b5c804b3 (patch) | |
tree | c430b9dc1ee04ecbe39da798524684b2db779b0f /drivers/usb/host | |
parent | 317b6d63000b3cc48c43d582d76063500e531a6c (diff) |
pcmcia: dev_node removal (drivers with updated printk call)
As a second step, remove any usage of dev_node_t from drivers which
only wrote to this typedef/struct, except one printk() which can
easily be replaced by a dev_info()/dev_warn() call.
CC: Harald Welte <laforge@gnumonks.org>
CC: linux-ide@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-usb@vger.kernel.org
Acked-by: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/sl811_cs.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c index a712788f9b10..58cb73c8420a 100644 --- a/drivers/usb/host/sl811_cs.c +++ b/drivers/usb/host/sl811_cs.c | |||
@@ -47,7 +47,6 @@ static const char driver_name[DEV_NAME_LEN] = "sl811_cs"; | |||
47 | 47 | ||
48 | typedef struct local_info_t { | 48 | typedef struct local_info_t { |
49 | struct pcmcia_device *p_dev; | 49 | struct pcmcia_device *p_dev; |
50 | dev_node_t node; | ||
51 | } local_info_t; | 50 | } local_info_t; |
52 | 51 | ||
53 | static void sl811_cs_release(struct pcmcia_device * link); | 52 | static void sl811_cs_release(struct pcmcia_device * link); |
@@ -185,7 +184,6 @@ static int sl811_cs_config_check(struct pcmcia_device *p_dev, | |||
185 | static int sl811_cs_config(struct pcmcia_device *link) | 184 | static int sl811_cs_config(struct pcmcia_device *link) |
186 | { | 185 | { |
187 | struct device *parent = &link->dev; | 186 | struct device *parent = &link->dev; |
188 | local_info_t *dev = link->priv; | ||
189 | int ret; | 187 | int ret; |
190 | 188 | ||
191 | dev_dbg(&link->dev, "sl811_cs_config\n"); | 189 | dev_dbg(&link->dev, "sl811_cs_config\n"); |
@@ -204,12 +202,8 @@ static int sl811_cs_config(struct pcmcia_device *link) | |||
204 | if (ret) | 202 | if (ret) |
205 | goto failed; | 203 | goto failed; |
206 | 204 | ||
207 | sprintf(dev->node.dev_name, driver_name); | 205 | dev_info(&link->dev, "index 0x%02x: ", |
208 | dev->node.major = dev->node.minor = 0; | 206 | link->conf.ConfigIndex); |
209 | link->dev_node = &dev->node; | ||
210 | |||
211 | printk(KERN_INFO "%s: index 0x%02x: ", | ||
212 | dev->node.dev_name, link->conf.ConfigIndex); | ||
213 | if (link->conf.Vpp) | 207 | if (link->conf.Vpp) |
214 | printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); | 208 | printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); |
215 | printk(", irq %d", link->irq); | 209 | printk(", irq %d", link->irq); |