Commit 7b9b0943 authored by Roland Dreier's avatar Roland Dreier Committed by David S. Miller
Browse files

cxgb3: Remove incorrect __devinit annotations 



When PCI error recovery was added to cxgb3, a function t3_io_slot_reset()
was added.  This function can call back into t3_prep_adapter() at any
time, so t3_prep_adapter() can no longer be marked __devinit.
This patch removes the __devinit annotation from t3_prep_adapter() and
all the functions that it calls, which fixes

    WARNING: drivers/net/cxgb3/built-in.o(.text+0x2427): Section mismatch in reference from the function t3_io_slot_reset() to the function .devinit.text:t3_prep_adapter()

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d96c75a3

drivers/net/cxgb3/mc5.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ void t3_mc5_intr_handler(struct mc5 *mc5) 
	t3_write_reg(adap, A_MC5_DB_INT_CAUSE, cause);

}



void __devinit t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode)

void t3_mc5_prep(struct adapter *adapter, struct mc5 *mc5, int mode)

{

#define K * 1024

drivers/net/cxgb3/sge.c

+1 −1
Original line number Diff line number Diff line
@@ -2836,7 +2836,7 @@ void t3_sge_init(struct adapter *adap, struct sge_params *p) 
 *	defaults for the assorted SGE parameters, which admins can change until

 *	they are used to initialize the SGE.

 */

void __devinit t3_sge_prep(struct adapter *adap, struct sge_params *p)

void t3_sge_prep(struct adapter *adap, struct sge_params *p)

{

	int i;

drivers/net/cxgb3/t3_hw.c

+10 −12
Original line number Diff line number Diff line
@@ -2675,7 +2675,7 @@ void t3_tp_set_max_rxsize(struct adapter *adap, unsigned int size) 
		     V_PMMAXXFERLEN0(size) | V_PMMAXXFERLEN1(size));

}



static void __devinit init_mtus(unsigned short mtus[])

static void init_mtus(unsigned short mtus[])

{

	/*

	 * See draft-mathis-plpmtud-00.txt for the values.  The min is 88 so
@@ -2703,7 +2703,7 @@ static void __devinit init_mtus(unsigned short mtus[]) 
/*

 * Initial congestion control parameters.

 */

static void __devinit init_cong_ctrl(unsigned short *a, unsigned short *b)

static void init_cong_ctrl(unsigned short *a, unsigned short *b)

{

	a[0] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = 1;

	a[9] = 2;
@@ -3354,8 +3354,7 @@ out_err: 
 *	Determines a card's PCI mode and associated parameters, such as speed

 *	and width.

 */

static void __devinit get_pci_mode(struct adapter *adapter,

				   struct pci_params *p)

static void get_pci_mode(struct adapter *adapter, struct pci_params *p)

{

	static unsigned short speed_map[] = { 33, 66, 100, 133 };

	u32 pci_mode, pcie_cap;
@@ -3395,8 +3394,7 @@ static void __devinit get_pci_mode(struct adapter *adapter, 
 *	capabilities and default speed/duplex/flow-control/autonegotiation

 *	settings.

 */

static void __devinit init_link_config(struct link_config *lc,

				       unsigned int caps)

static void init_link_config(struct link_config *lc, unsigned int caps)

{

	lc->supported = caps;

	lc->requested_speed = lc->speed = SPEED_INVALID;
@@ -3419,7 +3417,7 @@ static void __devinit init_link_config(struct link_config *lc, 
 *	Calculates the size of an MC7 memory in bytes from the value of its

 *	configuration register.

 */

static unsigned int __devinit mc7_calc_size(u32 cfg)

static unsigned int mc7_calc_size(u32 cfg)

{

	unsigned int width = G_WIDTH(cfg);

	unsigned int banks = !!(cfg & F_BKS) + 1;
@@ -3430,7 +3428,7 @@ static unsigned int __devinit mc7_calc_size(u32 cfg) 
	return MBs << 20;

}



static void __devinit mc7_prep(struct adapter *adapter, struct mc7 *mc7,

static void mc7_prep(struct adapter *adapter, struct mc7 *mc7,

		     unsigned int base_addr, const char *name)

{

	u32 cfg;
@@ -3517,7 +3515,7 @@ static int t3_reset_adapter(struct adapter *adapter) 
	return 0;

}



static int __devinit init_parity(struct adapter *adap)

static int init_parity(struct adapter *adap)

{

		int i, err, addr;
@@ -3552,8 +3550,8 @@ static int __devinit init_parity(struct adapter *adap) 
 * for some adapter tunables, take PHYs out of reset, and initialize the MDIO

 * interface.

 */

int __devinit t3_prep_adapter(struct adapter *adapter,

			      const struct adapter_info *ai, int reset)

int t3_prep_adapter(struct adapter *adapter, const struct adapter_info *ai,

		    int reset)

{

	int ret;

	unsigned int i, j = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE