From: Ben Dooks <ben-linux@fluff.org>
To: netdev@vger.kernel.org
Cc: jeff@garzik.org, akpm@linux-foundation.org, daniel@caiaq.de,
laurentp@cse-semaphore.com, Ben Dooks <ben-linux@fluff.org>
Subject: [PATCH 03/24 for-2.6.25] DM9000 use dev_xxx() instead of printk for output.
Date: Tue, 05 Feb 2008 00:02:02 +0000 [thread overview]
Message-ID: <20080205000814.959327446@fluff.org.uk> (raw)
In-Reply-To: 20080205000159.432081941@fluff.org.uk
[-- Attachment #1: simtec/simtec-drivers-net-dm9000-devmacros.patch --]
[-- Type: text/plain, Size: 6374 bytes --]
Move to using dev_dbg() and friends for the output of
information to the user.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Index: linux-2.6.24-git5-dm9k/drivers/net/dm9000.c
===================================================================
--- linux-2.6.24-git5-dm9k.orig/drivers/net/dm9000.c
+++ linux-2.6.24-git5-dm9k/drivers/net/dm9000.c
@@ -143,6 +143,8 @@ typedef struct board_info {
void (*outblk)(void __iomem *port, void *data, int length);
void (*dumpblk)(void __iomem *port, int length);
+ struct device *dev; /* parent device */
+
struct resource *addr_res; /* resources found */
struct resource *data_res;
struct resource *addr_req; /* resources requested */
@@ -185,7 +187,8 @@ static void program_eeprom(board_info_t
static void
dm9000_reset(board_info_t * db)
{
- PRINTK1("dm9000x: resetting\n");
+ dev_dbg(db->dev, "resetting device\n");
+
/* RESET device */
writeb(DM9000_NCR, db->io_addr);
udelay(200);
@@ -301,14 +304,10 @@ static void dm9000_set_io(struct board_i
db->inblk = dm9000_inblk_8bit;
break;
- case 2:
- db->dumpblk = dm9000_dumpblk_16bit;
- db->outblk = dm9000_outblk_16bit;
- db->inblk = dm9000_inblk_16bit;
- break;
case 3:
- printk(KERN_ERR PFX ": 3 byte IO, falling back to 16bit\n");
+ dev_dbg(db->dev, ": 3 byte IO, falling back to 16bit\n");
+ case 2:
db->dumpblk = dm9000_dumpblk_16bit;
db->outblk = dm9000_outblk_16bit;
db->inblk = dm9000_inblk_16bit;
@@ -411,18 +410,20 @@ dm9000_probe(struct platform_device *pde
/* Init network device */
ndev = alloc_etherdev(sizeof (struct board_info));
if (!ndev) {
- printk("%s: could not allocate device.\n", CARDNAME);
+ dev_err(&pdev->dev, "could not allocate device.\n");
return -ENOMEM;
}
SET_NETDEV_DEV(ndev, &pdev->dev);
- PRINTK2("dm9000_probe()");
+ dev_dbg(&pdev->dev, "dm9000_probe()");
/* setup board info structure */
db = (struct board_info *) ndev->priv;
memset(db, 0, sizeof (*db));
+ db->dev = &pdev->dev;
+
spin_lock_init(&db->lock);
if (pdev->num_resources < 2) {
@@ -451,7 +452,7 @@ dm9000_probe(struct platform_device *pde
if (db->addr_res == NULL || db->data_res == NULL ||
db->irq_res == NULL) {
- printk(KERN_ERR PFX "insufficient resources\n");
+ dev_err(db->dev, "insufficient resources\n");
ret = -ENOENT;
goto out;
}
@@ -461,7 +462,7 @@ dm9000_probe(struct platform_device *pde
pdev->name);
if (db->addr_req == NULL) {
- printk(KERN_ERR PFX "cannot claim address reg area\n");
+ dev_err(db->dev, "cannot claim address reg area\n");
ret = -EIO;
goto out;
}
@@ -469,7 +470,7 @@ dm9000_probe(struct platform_device *pde
db->io_addr = ioremap(db->addr_res->start, i);
if (db->io_addr == NULL) {
- printk(KERN_ERR "failed to ioremap address reg\n");
+ dev_err(db->dev, "failed to ioremap address reg\n");
ret = -EINVAL;
goto out;
}
@@ -479,7 +480,7 @@ dm9000_probe(struct platform_device *pde
pdev->name);
if (db->data_req == NULL) {
- printk(KERN_ERR PFX "cannot claim data reg area\n");
+ dev_err(db->dev, "cannot claim data reg area\n");
ret = -EIO;
goto out;
}
@@ -487,7 +488,7 @@ dm9000_probe(struct platform_device *pde
db->io_data = ioremap(db->data_res->start, iosize);
if (db->io_data == NULL) {
- printk(KERN_ERR "failed to ioremap data reg\n");
+ dev_err(db->dev,"failed to ioremap data reg\n");
ret = -EINVAL;
goto out;
}
@@ -541,11 +542,11 @@ dm9000_probe(struct platform_device *pde
if (id_val == DM9000_ID)
break;
- printk("%s: read wrong id 0x%08x\n", CARDNAME, id_val);
+ dev_err(db->dev, "read wrong id 0x%08x\n", id_val);
}
if (id_val != DM9000_ID) {
- printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);
+ dev_err(db->dev, "wrong id: 0x%08x\n", id_val);
ret = -ENODEV;
goto out;
}
@@ -593,8 +594,8 @@ dm9000_probe(struct platform_device *pde
}
if (!is_valid_ether_addr(ndev->dev_addr))
- printk("%s: Invalid ethernet MAC address. Please "
- "set using ifconfig\n", ndev->name);
+ dev_warn(db->dev, "%s: Invalid ethernet MAC address. Please "
+ "set using ifconfig\n", ndev->name);
platform_set_drvdata(pdev, ndev);
ret = register_netdev(ndev);
@@ -608,7 +609,7 @@ dm9000_probe(struct platform_device *pde
return 0;
out:
- printk("%s: not found (%d).\n", CARDNAME, ret);
+ dev_err(db->dev, "not found (%d).\n", ret);
dm9000_release_board(pdev, db);
free_netdev(ndev);
@@ -625,7 +626,7 @@ dm9000_open(struct net_device *dev)
{
board_info_t *db = (board_info_t *) dev->priv;
- PRINTK2("entering dm9000_open\n");
+ dev_dbg(db->dev, "entering %s\n", __func__);
if (request_irq(dev->irq, &dm9000_interrupt, DM9000_IRQ_FLAGS, dev->name, dev))
return -EAGAIN;
@@ -900,7 +901,7 @@ dm9000_rx(struct net_device *dev)
/* Status check: this byte must be 0 or 1 */
if (rxbyte > DM9000_PKT_RDY) {
- printk("status check failed: %d\n", rxbyte);
+ dev_warn(db->dev, "status check fail: %d\n", rxbyte);
iow(db, DM9000_RCR, 0x00); /* Stop Device */
iow(db, DM9000_ISR, IMR_PAR); /* Stop INT request */
return;
@@ -920,25 +921,25 @@ dm9000_rx(struct net_device *dev)
/* Packet Status check */
if (RxLen < 0x40) {
GoodPacket = false;
- PRINTK1("Bad Packet received (runt)\n");
+ dev_dbg(db->dev, "Bad Packet received (runt)\n");
}
if (RxLen > DM9000_PKT_MAX) {
- PRINTK1("RST: RX Len:%x\n", RxLen);
+ dev_dbg(db->dev, "RST: RX Len:%x\n", RxLen);
}
if (rxhdr.RxStatus & 0xbf) {
GoodPacket = false;
if (rxhdr.RxStatus & 0x01) {
- PRINTK1("fifo error\n");
+ dev_dbg(db->dev, "fifo error\n");
dev->stats.rx_fifo_errors++;
}
if (rxhdr.RxStatus & 0x02) {
- PRINTK1("crc error\n");
+ dev_dbg(db->dev, "crc error\n");
dev->stats.rx_crc_errors++;
}
if (rxhdr.RxStatus & 0x80) {
- PRINTK1("length error\n");
+ dev_dbg(db->dev, "length error\n");
dev->stats.rx_length_errors++;
}
}
@@ -1187,8 +1188,7 @@ dm9000_drv_remove(struct platform_device
dm9000_release_board(pdev, (board_info_t *) ndev->priv);
free_netdev(ndev); /* free device structure */
- PRINTK1("clean_module() exit\n");
-
+ dev_dbg(&pdev->dev, "released and freed device\n");
return 0;
}
--
Ben (ben@fluff.org, http://www.fluff.org/)
'a smiley only costs 4 bytes'
next prev parent reply other threads:[~2008-02-05 0:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-05 0:01 [PATCH 00/24 for-2.6.25] DM9000 updates for 2.6.25 Ben Dooks
2008-02-05 0:02 ` [PATCH 01/24 for-2.6.25] DM9000: Fix endian-ness of data accesses. Patch from: Laurent Pinchart <laurentp@cse-semaphore.com> Ben Dooks
2008-02-05 0:13 ` [PATCH 01/24 for-2.6.25] DM9000: Fix endian-ness of data accesses Ben Dooks
2008-02-05 22:57 ` [PATCH 01/24 for-2.6.25] DM9000: Fix endian-ness of data accesses. Patch from: Laurent Pinchart <laurentp@cse-semaphore.com> Francois Romieu
2008-02-06 11:46 ` Jeff Garzik
2008-02-07 13:28 ` Laurent Pinchart
2008-02-07 14:54 ` Jeff Garzik
2008-02-07 13:30 ` Christoph Hellwig
2008-02-05 0:02 ` [PATCH 02/24 for-2.6.25] DM9000: Add platform data to specify external phy " Ben Dooks
2008-02-05 0:14 ` [PATCH 02/24 for-2.6.25] DM9000: Add platform data to specify external phy Ben Dooks
2008-02-05 0:02 ` Ben Dooks [this message]
2008-02-05 0:02 ` [PATCH 04/24 for-2.6.25] DM9000 update debugging macros to use debug level Ben Dooks
2008-02-05 0:02 ` [PATCH 05/24 for-2.6.25] DM9000: Pass IRQ flags via platform resources Ben Dooks
2008-02-05 0:02 ` [PATCH 06/24 for-2.6.25] DM9000: Remove old timer based poll routines Ben Dooks
2008-02-05 0:02 ` [PATCH 07/24 for-2.6.25] DM9000: Add initial ethtool support Ben Dooks
2008-02-05 22:50 ` Francois Romieu
2008-02-06 22:03 ` Ben Dooks
2008-02-06 21:52 ` Francois Romieu
2008-02-06 22:16 ` Ben Dooks
2008-02-05 0:02 ` [PATCH 08/24 for-2.6.25] DM9000: Do not sleep with spinlock and IRQs held Ben Dooks
2008-02-05 0:02 ` [PATCH 09/24 for-2.6.25] DM9000: Use msleep() instead of udelay() Ben Dooks
2008-02-05 0:02 ` [PATCH 10/24 for-2.6.25] DM9000: Remove barely used SROM array read Ben Dooks
2008-02-05 0:02 ` [PATCH 11/24 for-2.6.25] DM9000: Add mutex to protect access Ben Dooks
2008-02-05 0:02 ` [PATCH 12/24 for-2.6.25] DM9000: Add ethtool support for reading and writing EEPROM Ben Dooks
2008-02-05 0:02 ` [PATCH 13/24 for-2.6.25] DM9000: Add ethtool control of msg_enable value Ben Dooks
2008-02-05 0:02 ` [PATCH 14/24 for-2.6.25] DM9000: Remove EEPROM initialisation code Ben Dooks
2008-02-05 0:02 ` [PATCH 15/24 for-2.6.25] DM9000: Ensure spinlock held whilst accessing EEPROM registers Ben Dooks
2008-02-05 0:02 ` [PATCH 16/24 for-2.6.25] DM9000: Remove unnecessary changelog in header comment Ben Dooks
2008-02-05 0:02 ` [PATCH 17/24 for-2.6.25] DM9000: Use netif_msg to enable debugging options Ben Dooks
2008-02-05 0:02 ` [PATCH 18/24 for-2.6.25] DM9000: Fix delays used by EEPROM read and write Ben Dooks
2008-02-05 0:02 ` [PATCH 19/24 for-2.6.25] DM9000: Remove cal_CRC() and use ether_crc_le instead Ben Dooks
2008-02-05 0:02 ` [PATCH 20/24 for-2.6.25] DM9000: Remove redudant use of "& 0xff" Ben Dooks
2008-02-05 0:02 ` [PATCH 21/24 for-2.6.25] DM9000: Add platform flag for no attached EEPROM Ben Dooks
2008-02-05 0:02 ` [PATCH 22/24 for-2.6.25] DM9000: Add support for MII ioctl() calls Ben Dooks
2008-02-05 0:02 ` [PATCH 23/24 for-2.6.25] DM9000: Update retry count whilst identifying chip Ben Dooks
2008-02-05 0:02 ` [PATCH 24/24 for-2.6.25] DM9000: Show the MAC address source after printing MAC Ben Dooks
2008-02-05 0:19 ` [PATCH 00/24 for-2.6.25] DM9000 updates for 2.6.25 Andrew Morton
2008-02-05 1:44 ` Ben Dooks
2008-02-05 9:52 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080205000814.959327446@fluff.org.uk \
--to=ben-linux@fluff.org \
--cc=akpm@linux-foundation.org \
--cc=daniel@caiaq.de \
--cc=jeff@garzik.org \
--cc=laurentp@cse-semaphore.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).