Home » Mailing list archives » linux-netdev » 2010 » March » 22

Re: [RFC PATCH 10/19] pcmcia: dev_node removal (drivers with updated printk call)

Previous thread: [RFC PATCH 09/19] pcmcia: dev_node removal (write-only drivers) by Dominik Brodowski on Sunday, March 21, 2010 - 4:07 pm. (1 message)

Next thread: [RFC PATCH 07/19] pcmcia: re-work pcmcia_request_irq() by Dominik Brodowski on Sunday, March 21, 2010 - 4:07 pm. (1 message)
[view original message]
From: Dominik Brodowski
Subject: [RFC PATCH 10/19] pcmcia: dev_node removal (drivers with updated printk call)
Date: Sunday, March 21, 2010 - 4:07 pm

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: Karsten Keil <isdn@linux-pingi.de>
CC: linux-wireless@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-usb@vger.kernel.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/char/pcmcia/cm4000_cs.c    |    9 +-----
 drivers/char/pcmcia/synclink_cs.c  |   10 +-----
 drivers/ide/ide-cs.c               |   12 ++-----
 drivers/isdn/hardware/avm/avm_cs.c |   60 +++---------------------------------
 drivers/isdn/hisax/elsa_cs.c       |   27 +---------------
 drivers/isdn/hisax/sedlbauer_cs.c  |   37 +---------------------
 drivers/isdn/hisax/teles_cs.c      |   37 +---------------------
 drivers/net/wireless/airo_cs.c     |   47 +---------------------------
 drivers/usb/host/sl811_cs.c        |   10 +-----
 9 files changed, 22 insertions(+), 227 deletions(-)

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index c9bc896..251faa1 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -106,7 +106,6 @@ static int major;		/* major number we get from the kernel */
 
 struct cm4000_dev {
 	struct pcmcia_device *p_dev;
-	dev_node_t node;		/* OS node (major,minor) */
 
 	unsigned char atr[MAX_ATR];
 	unsigned char rbuf[512];
@@ -884,8 +883,7 @@ static void monitor_card(unsigned long p)
 		/* slow down warning, but prompt immediately after insertion */
 		if (dev->cwarn == 0 || dev->cwarn == 10) {
 			set_bit(IS_BAD_CARD, &dev->flags);
-			printk(KERN_WARNING MODULE_NAME ": device %s: ",
-			       dev->node.dev_name);
+			dev_warn(&dev->p_dev->dev, MODULE_NAME ": ");
 			if (test_bit(IS_BAD_CSUM, &dev->flags)) {
 				DEBUGP(4, dev, "ATR checksum (0x%.2x, should "
 				       "be zero) failed\n", dev->atr_csum);
@@ -1779,11 +1777,6 @@ ...
[ message continues ]
[view original message]
From: Karsten Keil
Subject: Re: [RFC PATCH 10/19] pcmcia: dev_node removal (drivers with updated printk call)
Date: Sunday, March 21, 2010 - 10:22 pm

Acked-by: Karsten Keil  <isdn@linux-pingi.de>

Thanks.
--


[ message continues ]
Previous thread: [RFC PATCH 09/19] pcmcia: dev_node removal (write-only drivers) by Dominik Brodowski on Sunday, March 21, 2010 - 4:07 pm. (1 message)

Next thread: [RFC PATCH 07/19] pcmcia: re-work pcmcia_request_irq() by Dominik Brodowski on Sunday, March 21, 2010 - 4:07 pm. (1 message)