Commit 71e233a2 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: added __iomem qualifier to softmac phy 



Code cleanup. Makes it clear when an address is mapped IO space.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ffa1350e

drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c

+9 −10
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ void write_phy_channel_reg(struct brcms_phy *pi, uint val) 


u16 read_phy_reg(struct brcms_phy *pi, u16 addr)

{

	struct d11regs *regs;

	struct d11regs __iomem *regs;



	regs = pi->regs;
@@ -335,7 +335,7 @@ u16 read_phy_reg(struct brcms_phy *pi, u16 addr) 


void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)

{

	struct d11regs *regs;

	struct d11regs __iomem *regs;



	regs = pi->regs;
@@ -345,8 +345,7 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) 
	if (addr == 0x72)

		(void)R_REG(&regs->phyregdata);

#else

	W_REG((u32 *)(&regs->phyregaddr),

	      addr | (val << 16));

	W_REG((u32 __iomem *)(&regs->phyregaddr), addr | (val << 16));

	if (++pi->phy_wreg >= pi->phy_wreg_limit) {

		pi->phy_wreg = 0;

		(void)R_REG(&regs->phyversion);
@@ -356,7 +355,7 @@ void write_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) 


void and_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)

{

	struct d11regs *regs;

	struct d11regs __iomem *regs;



	regs = pi->regs;
@@ -368,7 +367,7 @@ void and_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) 


void or_phy_reg(struct brcms_phy *pi, u16 addr, u16 val)

{

	struct d11regs *regs;

	struct d11regs __iomem *regs;



	regs = pi->regs;
@@ -380,7 +379,7 @@ void or_phy_reg(struct brcms_phy *pi, u16 addr, u16 val) 


void mod_phy_reg(struct brcms_phy *pi, u16 addr, u16 mask, u16 val)

{

	struct d11regs *regs;

	struct d11regs __iomem *regs;



	regs = pi->regs;
@@ -494,8 +493,8 @@ static u32 wlc_phy_get_radio_ver(struct brcms_phy *pi) 
}



struct brcms_phy_pub *

wlc_phy_attach(struct shared_phy *sh, struct d11regs *regs, int bandtype,

	       char *vars, struct wiphy *wiphy)

wlc_phy_attach(struct shared_phy *sh, struct d11regs __iomem *regs,

	       int bandtype, char *vars, struct wiphy *wiphy)

{

	struct brcms_phy *pi;

	u32 sflags = 0;
@@ -1065,7 +1064,7 @@ wlc_phy_init_radio_regs(struct brcms_phy *pi, 
void wlc_phy_do_dummy_tx(struct brcms_phy *pi, bool ofdm, bool pa_on)

{

#define DUMMY_PKT_LEN   20

	struct d11regs *regs = pi->regs;

	struct d11regs __iomem *regs = pi->regs;

	int i, count;

	u8 ofdmpkt[DUMMY_PKT_LEN] = {

		0xcc, 0x01, 0x02, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00,

drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ struct shared_phy_params { 


extern struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp);

extern struct brcms_phy_pub *wlc_phy_attach(struct shared_phy *sh,

					    struct d11regs *regs,

					    struct d11regs __iomem *regs,

					    int bandtype, char *vars,

					    struct wiphy *wiphy);

extern void wlc_phy_detach(struct brcms_phy_pub *ppi);

drivers/staging/brcm80211/brcmsmac/phy/phy_int.h

+1 −1
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ struct brcms_phy { 
	} u;

	bool user_txpwr_at_rfport;



	struct d11regs *regs;

	struct d11regs __iomem *regs;

	struct brcms_phy *next;

	char *vars;

	struct brcms_phy_pub pubpi;

drivers/staging/brcm80211/brcmsmac/phy/phy_n.c

+5 −4
Original line number Diff line number Diff line
@@ -19363,7 +19363,7 @@ void wlc_phy_init_nphy(struct brcms_phy *pi) 
	bool do_nphy_cal = false;

	uint core;

	uint origidx, intr_val;

	struct d11regs *regs;

	struct d11regs __iomem *regs;

	u32 d11_clk_ctl_st;

	bool do_rssi_cal = false;








@@ -19385,7 +19385,8 @@ void wlc_phy_init_nphy(struct brcms_phy *pi)







	if ((pi->nphy_gband_spurwar2_en) && CHSPEC_IS2G(pi->radio_chanspec) &&









	    CHSPEC_IS40(pi->radio_chanspec)) {

















		regs = (struct d11regs *) ai_switch_core(pi->sh->sih,









		regs = (struct d11regs __iomem *)









				ai_switch_core(pi->sh->sih,









					       D11_CORE_ID, &origidx,









					       &intr_val);









		d11_clk_ctl_st = R_REG(&regs->clk_ctl_st);



























































CRA Git | Maintained and supported by SUSTech CRA and CCSE