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

Commit d273bb20 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: Move pr_fmt macros to a single location 



Although the rtlwifi family of devices contains 11 copies of the pr_fmt
macro, the macro is not defined for all routines that need it. By moving
the macro to wifi.h, a single copy is available for all routines.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 608383bf

drivers/net/wireless/rtlwifi/base.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -27,10 +27,6 @@ 
 *

 *

 *****************************************************************************/

 *****************************************************************************/





#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/ip.h>

#include <linux/module.h>

#include "wifi.h"

#include "wifi.h"

#include "rc.h"

#include "rc.h"

#include "base.h"

#include "base.h"
@@ -39,6 +35,9 @@ 
#include "ps.h"

#include "ps.h"

#include "regd.h"

#include "regd.h"





#include <linux/ip.h>

#include <linux/module.h>



/*

/*

 *NOTICE!!!: This file will be very big, we hsould

 *NOTICE!!!: This file will be very big, we hsould

 *keep it clear under follwing roles:

 *keep it clear under follwing roles:

drivers/net/wireless/rtlwifi/cam.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -27,8 +27,6 @@ 
 *

 *

 *****************************************************************************/

 *****************************************************************************/





#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt



#include <linux/export.h>

#include <linux/export.h>

#include "wifi.h"

#include "wifi.h"

#include "cam.h"

#include "cam.h"

drivers/net/wireless/rtlwifi/core.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -30,8 +30,6 @@ 
#ifndef __RTL_CORE_H__

#ifndef __RTL_CORE_H__

#define __RTL_CORE_H__

#define __RTL_CORE_H__





#include <net/mac80211.h>



#define RTL_SUPPORTED_FILTERS		\

#define RTL_SUPPORTED_FILTERS		\

	(FIF_PROMISC_IN_BSS | \

	(FIF_PROMISC_IN_BSS | \

	FIF_ALLMULTI | FIF_CONTROL | \

	FIF_ALLMULTI | FIF_CONTROL | \

drivers/net/wireless/rtlwifi/debug.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,8 @@ 




#include "wifi.h"

#include "wifi.h"





#include <linux/moduleparam.h>



void rtl_dbgp_flag_init(struct ieee80211_hw *hw)

void rtl_dbgp_flag_init(struct ieee80211_hw *hw)

{

{

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

drivers/net/wireless/rtlwifi/pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -27,13 +27,13 @@ 
 *

 *

 *****************************************************************************/

 *****************************************************************************/





#include <linux/export.h>

#include "core.h"

#include "wifi.h"

#include "wifi.h"

#include "core.h"

#include "pci.h"

#include "pci.h"

#include "base.h"

#include "base.h"

#include "ps.h"

#include "ps.h"

#include "efuse.h"

#include "efuse.h"

#include <linux/export.h>





static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {

static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {

	PCI_VENDOR_ID_INTEL,

	PCI_VENDOR_ID_INTEL,