Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / qeth_l2_main.c

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 1b1e80336d2c516deffc59eff87e08b9e03706cf..21627ba3093be6aec8d4718afba2ca4e91248b62 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -8,6 +8,9 @@
  *              Frank Blaschka <frank.blaschka@de.ibm.com>
  */
 
+#define KMSG_COMPONENT "qeth"
+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/string.h>
@@ -131,17 +134,13 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
        mac = &cmd->data.setdelmac.mac[0];
        /* MAC already registered, needed in couple/uncouple case */
        if (cmd->hdr.return_code == 0x2005) {
-               QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x "
-                         "already existing on %s \n",
-                         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                         QETH_CARD_IFNAME(card));
+               QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
+                         mac, QETH_CARD_IFNAME(card));
                cmd->hdr.return_code = 0;
        }
        if (cmd->hdr.return_code)
-               QETH_DBF_MESSAGE(2, "Could not set group MAC "
-                         "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
-                         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                         QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+               QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n",
+                         mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
        return 0;
 }
 
@@ -163,10 +162,8 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
        cmd = (struct qeth_ipa_cmd *) data;
        mac = &cmd->data.setdelmac.mac[0];
        if (cmd->hdr.return_code)
-               QETH_DBF_MESSAGE(2, "Could not delete group MAC "
-                         "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
-                         mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                         QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+               QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n",
+                         mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
        return 0;
 }
 
@@ -503,12 +500,13 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                card->info.mac_bits |= QETH_LAYER2_MAC_REGISTERED;
                memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,
                       OSA_ADDR_LEN);
-               PRINT_INFO("MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-                          "successfully registered on device %s\n",
-                          card->dev->dev_addr[0], card->dev->dev_addr[1],
-                          card->dev->dev_addr[2], card->dev->dev_addr[3],
-                          card->dev->dev_addr[4], card->dev->dev_addr[5],
-                          card->dev->name);
+               dev_info(&card->gdev->dev,
+                       "MAC address %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
+                       "successfully registered on device %s\n",
+                       card->dev->dev_addr[0], card->dev->dev_addr[1],
+                       card->dev->dev_addr[2], card->dev->dev_addr[3],
+                       card->dev->dev_addr[4], card->dev->dev_addr[5],
+                       card->dev->name);
        }
        return 0;
 }
@@ -1015,9 +1013,8 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        if (rc) {
                QETH_DBF_TEXT_(SETUP, 2, "1err%d", rc);
                if (rc == 0xe080) {
-                       PRINT_WARN("LAN on card %s if offline! "
-                                  "Waiting for STARTLAN from card.\n",
-                                  CARD_BUS_ID(card));
+                       dev_warn(&card->gdev->dev,
+                               "The LAN is offline\n");
                        card->lan_online = 0;
                }
                return rc;
@@ -1117,8 +1114,8 @@ static int qeth_l2_recover(void *ptr)
        if (!qeth_do_run_thread(card, QETH_RECOVER_THREAD))
                return 0;
        QETH_DBF_TEXT(TRACE, 2, "recover2");
-       PRINT_WARN("Recovery of device %s started ...\n",
-                  CARD_BUS_ID(card));
+       dev_warn(&card->gdev->dev,
+               "A recovery process has been started for the device\n");
        card->use_hard_stop = 1;
        __qeth_l2_set_offline(card->gdev, 1);
        rc = __qeth_l2_set_online(card->gdev, 1);
@@ -1126,27 +1123,29 @@ static int qeth_l2_recover(void *ptr)
        qeth_clear_thread_start_bit(card, QETH_RECOVER_THREAD);
        qeth_clear_thread_running_bit(card, QETH_RECOVER_THREAD);
        if (!rc)
-               PRINT_INFO("Device %s successfully recovered!\n",
-                          CARD_BUS_ID(card));
+               dev_info(&card->gdev->dev,
+                       "Device successfully recovered!\n");
        else {
-               rtnl_lock();
-               dev_close(card->dev);
-               rtnl_unlock();
-               PRINT_INFO("Device %s could not be recovered!\n",
-                          CARD_BUS_ID(card));
+               if (card->dev) {
+                       rtnl_lock();
+                       dev_close(card->dev);
+                       rtnl_unlock();
+               }
+               dev_warn(&card->gdev->dev, "The qeth device driver "
+                       "failed to recover an error on the device\n");
        }
        return 0;
 }
 
 static int __init qeth_l2_init(void)
 {
-       PRINT_INFO("register layer 2 discipline\n");
+       pr_info("register layer 2 discipline\n");
        return 0;
 }
 
 static void __exit qeth_l2_exit(void)
 {
-       PRINT_INFO("unregister layer 2 discipline\n");
+       pr_info("unregister layer 2 discipline\n");
 }
 
 static void qeth_l2_shutdown(struct ccwgroup_device *gdev)