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/ide | |
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/ide')
-rw-r--r-- | drivers/ide/ide-cs.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c index 17ad91e453e4..0b7815d2581c 100644 --- a/drivers/ide/ide-cs.c +++ b/drivers/ide/ide-cs.c | |||
@@ -65,8 +65,7 @@ MODULE_LICENSE("Dual MPL/GPL"); | |||
65 | typedef struct ide_info_t { | 65 | typedef struct ide_info_t { |
66 | struct pcmcia_device *p_dev; | 66 | struct pcmcia_device *p_dev; |
67 | struct ide_host *host; | 67 | struct ide_host *host; |
68 | int ndev; | 68 | int ndev; |
69 | dev_node_t node; | ||
70 | } ide_info_t; | 69 | } ide_info_t; |
71 | 70 | ||
72 | static void ide_release(struct pcmcia_device *); | 71 | static void ide_release(struct pcmcia_device *); |
@@ -308,13 +307,10 @@ static int ide_config(struct pcmcia_device *link) | |||
308 | goto failed; | 307 | goto failed; |
309 | 308 | ||
310 | info->ndev = 1; | 309 | info->ndev = 1; |
311 | sprintf(info->node.dev_name, "hd%c", 'a' + host->ports[0]->index * 2); | ||
312 | info->node.major = host->ports[0]->major; | ||
313 | info->node.minor = 0; | ||
314 | info->host = host; | 310 | info->host = host; |
315 | link->dev_node = &info->node; | 311 | dev_info(&link->dev, "ide-cs: hd%c: Vpp = %d.%d\n", |
316 | printk(KERN_INFO "ide-cs: %s: Vpp = %d.%d\n", | 312 | 'a' + host->ports[0]->index * 2, |
317 | info->node.dev_name, link->conf.Vpp / 10, link->conf.Vpp % 10); | 313 | link->conf.Vpp / 10, link->conf.Vpp % 10); |
318 | 314 | ||
319 | kfree(stk); | 315 | kfree(stk); |
320 | return 0; | 316 | return 0; |