Commit fe5388c3 authored by YAMANE Toshiaki's avatar YAMANE Toshiaki Committed by Greg Kroah-Hartman
Browse files

staging/rtl8187se: Use dev_ or pr_ printks in r8180_core.c 



The following warnings fixed.
- WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...
- WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(...  to printk(KERN_INFO ...
- WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(...  to printk(KERN_WARNING ...

Signed-off-by: default avatarYAMANE Toshiaki <yamanetoshi@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac8bc123

drivers/staging/rtl8187se/r8180_core.c

+13 −10
Original line number Original line Diff line number Diff line
@@ -27,6 +27,8 @@ 
   Written by Mariusz Matuszek.

   Written by Mariusz Matuszek.

*/

*/





#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#undef RX_DONT_PASS_UL

#undef RX_DONT_PASS_UL

#undef DUMMY_RX

#undef DUMMY_RX
@@ -116,8 +118,7 @@ static int rtl8180_resume(struct pci_dev *pdev) 




	err = pci_enable_device(pdev);

	err = pci_enable_device(pdev);

	if (err) {

	if (err) {

		printk(KERN_ERR "%s: pci_enable_device failed on resume\n",

		dev_err(&pdev->dev, "pci_enable_device failed on resume\n");

				dev->name);





		return err;

		return err;

	}

	}
@@ -2154,7 +2155,8 @@ void rtl8180_wmm_param_update(struct work_struct *work) 
					write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);

					write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);

					break;

					break;

				default:

				default:

					printk(KERN_WARNING "SetHwReg8185():invalid ACI: %d!\n", eACI);

					pr_warn("SetHwReg8185():invalid ACI: %d!\n",

						eACI);

					break;

					break;

				}

				}

			}

			}
@@ -2193,7 +2195,8 @@ void rtl8180_wmm_param_update(struct work_struct *work) 
				write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);

				write_nic_dword(dev, AC_VO_PARAM, u4bAcParam);

				break;

				break;

			default:

			default:

				printk(KERN_WARNING "SetHwReg8185(): invalid ACI: %d !\n", eACI);

				pr_warn("SetHwReg8185(): invalid ACI: %d !\n",

					eACI);

				break;

				break;

			}

			}

		}

		}
@@ -3340,27 +3343,27 @@ static int __init rtl8180_pci_module_init(void) 




	ret = ieee80211_crypto_init();

	ret = ieee80211_crypto_init();

	if (ret) {

	if (ret) {

		printk(KERN_ERR "ieee80211_crypto_init() failed %d\n", ret);

		pr_err("ieee80211_crypto_init() failed %d\n", ret);

		return ret;

		return ret;

	}

	}

	ret = ieee80211_crypto_tkip_init();

	ret = ieee80211_crypto_tkip_init();

	if (ret) {

	if (ret) {

		printk(KERN_ERR "ieee80211_crypto_tkip_init() failed %d\n", ret);

		pr_err("ieee80211_crypto_tkip_init() failed %d\n", ret);

		return ret;

		return ret;

	}

	}

	ret = ieee80211_crypto_ccmp_init();

	ret = ieee80211_crypto_ccmp_init();

	if (ret) {

	if (ret) {

		printk(KERN_ERR "ieee80211_crypto_ccmp_init() failed %d\n", ret);

		pr_err("ieee80211_crypto_ccmp_init() failed %d\n", ret);

		return ret;

		return ret;

	}

	}

	ret = ieee80211_crypto_wep_init();

	ret = ieee80211_crypto_wep_init();

	if (ret) {

	if (ret) {

		printk(KERN_ERR "ieee80211_crypto_wep_init() failed %d\n", ret);

		pr_err("ieee80211_crypto_wep_init() failed %d\n", ret);

		return ret;

		return ret;

	}

	}





	printk(KERN_INFO "\nLinux kernel driver for RTL8180 / RTL8185 based WLAN cards\n");

	pr_info("\nLinux kernel driver for RTL8180 / RTL8185 based WLAN cards\n");

	printk(KERN_INFO "Copyright (c) 2004-2005, Andrea Merello\n");

	pr_info("Copyright (c) 2004-2005, Andrea Merello\n");

	DMESG("Initializing module");

	DMESG("Initializing module");

	DMESG("Wireless extensions version %d", WIRELESS_EXT);

	DMESG("Wireless extensions version %d", WIRELESS_EXT);

	rtl8180_proc_module_init();

	rtl8180_proc_module_init();