diff options
author | Joe Perches <joe@perches.com> | 2011-05-02 19:49:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-05-11 13:06:02 -0400 |
commit | f3a57fd148a4afd3c38f558c5b44972cb29ea8ba (patch) | |
tree | 7c1d553f33e2ed0d58c4a978ddd6be68ba592eb3 /drivers/net/wireless/libertas/if_cs.c | |
parent | 0e4e06ae5e895864b4a4bca7eec2e3015fddca98 (diff) |
libertas: Use netdev_<level> or dev_<level> where possible
Using the more descriptive logging styles gives a bit
more information about the device being operated on.
Makes the object trivially smaller too.
$ size drivers/net/wireless/libertas/built-in.o.*
187730 2973 38488 229191 37f47 drivers/net/wireless/libertas/built-in.o.new
188195 2973 38488 229656 38118 drivers/net/wireless/libertas/built-in.o.old
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/if_cs.c')
-rw-r--r-- | drivers/net/wireless/libertas/if_cs.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index f2d10115f5e5..63ed5798365c 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
@@ -364,7 +364,7 @@ static int if_cs_send_cmd(struct lbs_private *priv, u8 *buf, u16 nb) | |||
364 | if (status & IF_CS_BIT_COMMAND) | 364 | if (status & IF_CS_BIT_COMMAND) |
365 | break; | 365 | break; |
366 | if (++loops > 100) { | 366 | if (++loops > 100) { |
367 | pr_err("card not ready for commands\n"); | 367 | netdev_err(priv->dev, "card not ready for commands\n"); |
368 | goto done; | 368 | goto done; |
369 | } | 369 | } |
370 | mdelay(1); | 370 | mdelay(1); |
@@ -434,14 +434,16 @@ static int if_cs_receive_cmdres(struct lbs_private *priv, u8 *data, u32 *len) | |||
434 | /* is hardware ready? */ | 434 | /* is hardware ready? */ |
435 | status = if_cs_read16(priv->card, IF_CS_CARD_STATUS); | 435 | status = if_cs_read16(priv->card, IF_CS_CARD_STATUS); |
436 | if ((status & IF_CS_BIT_RESP) == 0) { | 436 | if ((status & IF_CS_BIT_RESP) == 0) { |
437 | pr_err("no cmd response in card\n"); | 437 | netdev_err(priv->dev, "no cmd response in card\n"); |
438 | *len = 0; | 438 | *len = 0; |
439 | goto out; | 439 | goto out; |
440 | } | 440 | } |
441 | 441 | ||
442 | *len = if_cs_read16(priv->card, IF_CS_RESP_LEN); | 442 | *len = if_cs_read16(priv->card, IF_CS_RESP_LEN); |
443 | if ((*len == 0) || (*len > LBS_CMD_BUFFER_SIZE)) { | 443 | if ((*len == 0) || (*len > LBS_CMD_BUFFER_SIZE)) { |
444 | pr_err("card cmd buffer has invalid # of bytes (%d)\n", *len); | 444 | netdev_err(priv->dev, |
445 | "card cmd buffer has invalid # of bytes (%d)\n", | ||
446 | *len); | ||
445 | goto out; | 447 | goto out; |
446 | } | 448 | } |
447 | 449 | ||
@@ -475,7 +477,9 @@ static struct sk_buff *if_cs_receive_data(struct lbs_private *priv) | |||
475 | 477 | ||
476 | len = if_cs_read16(priv->card, IF_CS_READ_LEN); | 478 | len = if_cs_read16(priv->card, IF_CS_READ_LEN); |
477 | if (len == 0 || len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) { | 479 | if (len == 0 || len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) { |
478 | pr_err("card data buffer has invalid # of bytes (%d)\n", len); | 480 | netdev_err(priv->dev, |
481 | "card data buffer has invalid # of bytes (%d)\n", | ||
482 | len); | ||
479 | priv->dev->stats.rx_dropped++; | 483 | priv->dev->stats.rx_dropped++; |
480 | goto dat_err; | 484 | goto dat_err; |
481 | } | 485 | } |
@@ -761,7 +765,8 @@ static int if_cs_host_to_card(struct lbs_private *priv, | |||
761 | ret = if_cs_send_cmd(priv, buf, nb); | 765 | ret = if_cs_send_cmd(priv, buf, nb); |
762 | break; | 766 | break; |
763 | default: | 767 | default: |
764 | pr_err("%s: unsupported type %d\n", __func__, type); | 768 | netdev_err(priv->dev, "%s: unsupported type %d\n", |
769 | __func__, type); | ||
765 | } | 770 | } |
766 | 771 | ||
767 | lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); | 772 | lbs_deb_leave_args(LBS_DEB_CS, "ret %d", ret); |