3 files changed, 11 insertions, 25 deletions

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 395c04c2b00f..65ebee0a3266 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -113,11 +113,9 @@ static inline int iucv_dbf_passes(debug_info_t *dbf_grp, int level)
 #define IUCV_DBF_TEXT_(name, level, text...) \
         do { \
                 if (iucv_dbf_passes(iucv_dbf_##name, level)) { \
-                        char* iucv_dbf_txt_buf = \
-                                        get_cpu_var(iucv_dbf_txt_buf); \
-                        sprintf(iucv_dbf_txt_buf, text); \
-                        debug_text_event(iucv_dbf_##name, level, \
-                                                iucv_dbf_txt_buf); \
+                        char* __buf = get_cpu_var(iucv_dbf_txt_buf); \
+                        sprintf(__buf, text); \
+                        debug_text_event(iucv_dbf_##name, level, __buf); \
                         put_cpu_var(iucv_dbf_txt_buf); \
                 } \
         } while (0)
@@ -161,7 +159,7 @@ static void netiucv_pm_complete(struct device *);
 static int netiucv_pm_freeze(struct device *);
 static int netiucv_pm_restore_thaw(struct device *);
 
-static struct dev_pm_ops netiucv_pm_ops = {
+static const struct dev_pm_ops netiucv_pm_ops = {
         .prepare = netiucv_pm_prepare,
         .complete = netiucv_pm_complete,
         .freeze = netiucv_pm_freeze,
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 0b763396d5d1..038299ae3feb 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -486,22 +486,14 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                 case IPA_RC_L2_DUP_MAC:
                 case IPA_RC_L2_DUP_LAYER3_MAC:
                         dev_warn(&card->gdev->dev,
-                                "MAC address "
-                                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-                                "already exists\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]);
+                                "MAC address %pM already exists\n",
+                                card->dev->dev_addr);
                         break;
                 case IPA_RC_L2_MAC_NOT_AUTH_BY_HYP:
                 case IPA_RC_L2_MAC_NOT_AUTH_BY_ADP:
                         dev_warn(&card->gdev->dev,
-                                "MAC address "
-                                "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x "
-                                "is not authorized\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]);
+                                "MAC address %pM is not authorized\n",
+                                card->dev->dev_addr);
                         break;
                 default:
                         break;
@@ -512,12 +504,8 @@ static int qeth_l2_send_setmac_cb(struct qeth_card *card,
                 memcpy(card->dev->dev_addr, cmd->data.setdelmac.mac,
                        OSA_ADDR_LEN);
                 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);
+                        "MAC address %pM successfully registered on device %s\n",
+                        card->dev->dev_addr, card->dev->name);
         }
         return 0;
 }
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 3012355f8304..67f2485d2372 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -168,7 +168,7 @@ static int smsg_pm_restore_thaw(struct device *dev)
         return 0;
 }
 
-static struct dev_pm_ops smsg_pm_ops = {
+static const struct dev_pm_ops smsg_pm_ops = {
         .freeze = smsg_pm_freeze,
         .thaw = smsg_pm_restore_thaw,
         .restore = smsg_pm_restore_thaw,