[S390] convert qeth printks to dev_xxx and pr_xxx macros.

Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 20 insertions, 17 deletions

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 1b1e80336d2c..af15bc648ba1 100644
--- 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>
@@ -503,12 +506,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 +1019,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 +1120,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 +1129,27 @@ 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));
+                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)