Staging: wlan-ng: Fixing coding style warnings
authorSimo Koskinen <koskisoft@gmail.com>
Tue, 18 Jul 2017 08:23:45 +0000 (10:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Jul 2017 15:17:53 +0000 (08:17 -0700)
Removes following warnings found by checkpatch.pl script:

WARNING: Prefer using '"%s...", __func__' to using 'xxx',
this function's name, in a string

Signed-off-by: Simo Koskinen <koskisoft@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wlan-ng/p80211netdev.c
drivers/staging/wlan-ng/prism2fw.c

index 021fb23ae9babfe6b31e87c1e66dbd192cb98f35..0f503652740fa3b350aff5639c789e26acdb6f34 100644 (file)
@@ -258,7 +258,7 @@ static int p80211_convert_to_ether(struct wlandevice *wlandev,
                return 0;
        }
 
-       netdev_dbg(wlandev->netdev, "p80211_convert_to_ether failed.\n");
+       netdev_dbg(wlandev->netdev, "%s failed.\n", __func__);
        return CONV_TO_ETHER_FAILED;
 }
 
index 1a0c786c7616ce54765f0961180c1ce6b4255a71..344bec8cc31b3ea2bf3044474b7d81e2445d3624 100644 (file)
@@ -1016,7 +1016,8 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
                kfree(rstmsg);
                kfree(rwrmsg);
                netdev_err(wlandev->netdev,
-                          "writeimage: no memory for firmware download, aborting download\n");
+                          "%s: no memory for firmware download, aborting download\n",
+                          __func__);
                return -ENOMEM;
        }
 
@@ -1058,15 +1059,15 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
        result = prism2mgmt_ramdl_state(wlandev, rstmsg);
        if (result) {
                netdev_err(wlandev->netdev,
-                          "writeimage state enable failed w/ result=%d, aborting download\n",
-                          result);
+                          "%s state enable failed w/ result=%d, aborting download\n",
+                          __func__, result);
                goto free_result;
        }
        resultcode = rstmsg->resultcode.data;
        if (resultcode != P80211ENUM_resultcode_success) {
                netdev_err(wlandev->netdev,
-                          "writeimage()->xxxdl_state msg indicates failure, w/ resultcode=%d, aborting download.\n",
-                          resultcode);
+                          "%s()->xxxdl_state msg indicates failure, w/ resultcode=%d, aborting download.\n",
+                          __func__, resultcode);
                result = 1;
                goto free_result;
        }
@@ -1102,14 +1103,14 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
                        /* Check the results */
                        if (result) {
                                netdev_err(wlandev->netdev,
-                                          "writeimage chunk write failed w/ result=%d, aborting download\n",
-                                          result);
+                                          "%s chunk write failed w/ result=%d, aborting download\n",
+                                          __func__, result);
                                goto free_result;
                        }
                        resultcode = rstmsg->resultcode.data;
                        if (resultcode != P80211ENUM_resultcode_success) {
-                               pr_err("writeimage()->xxxdl_write msg indicates failure, w/ resultcode=%d, aborting download.\n",
-                                      resultcode);
+                               pr_err("%s()->xxxdl_write msg indicates failure, w/ resultcode=%d, aborting download.\n",
+                                      __func__, resultcode);
                                result = 1;
                                goto free_result;
                        }
@@ -1124,15 +1125,15 @@ static int writeimage(struct wlandevice *wlandev, struct imgchunk *fchunk,
        result = prism2mgmt_ramdl_state(wlandev, rstmsg);
        if (result) {
                netdev_err(wlandev->netdev,
-                          "writeimage state disable failed w/ result=%d, aborting download\n",
-                          result);
+                          "%s state disable failed w/ result=%d, aborting download\n",
+                          __func__, result);
                goto free_result;
        }
        resultcode = rstmsg->resultcode.data;
        if (resultcode != P80211ENUM_resultcode_success) {
                netdev_err(wlandev->netdev,
-                          "writeimage()->xxxdl_state msg indicates failure, w/ resultcode=%d, aborting download.\n",
-                          resultcode);
+                          "%s()->xxxdl_state msg indicates failure, w/ resultcode=%d, aborting download.\n",
+                          __func__, resultcode);
                result = 1;
                goto free_result;
        }