Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d6fc83 authored by Simo Koskinen's avatar Simo Koskinen Committed by Greg Kroah-Hartman
Browse files

Staging: wlan-ng: Fixing coding style warnings 



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: default avatarSimo Koskinen <koskisoft@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f049fd90

drivers/staging/wlan-ng/p80211netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/staging/wlan-ng/prism2fw.c

+14 −13
Original line number Diff line number Diff line
@@ -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;

	}