uninline atl1e_setup_mac_ctrl()

AdrianBunk · torvalds · commit e6ca23289f86 · 2008-08-09T11:15:13.000-07:00
There doesn't seem to be a compelling reason why atl1e_setup_mac_ctrl()
is marked as "inline":

It's not used in any place where speed would matter much, and as long as
it has only one caller non-ancient gcc versions anyway inline it
automatically.

This patch fixes the following compile error with gcc 3.4:

    CC      drivers/net/atl1e/atl1e_main.o
  atl1e_main.c: In function `atl1e_check_link':
  atl1e_main.c:50: sorry, unimplemented: inlining failed in call to
  atl1e_main.c:196: sorry, unimplemented: called from here

Reported-by: Adrian Bunk &lt;bunk@kernel.org&gt;
Signed-off-by: Adrian Bunk &lt;bunk@kernel.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
@@ -47,7 +47,7 @@ MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 
-static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);
+static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);
 
 static const u16
 atl1e_rx_page_vld_regs[AT_MAX_RECEIVE_QUEUE][AT_PAGE_NUM_PER_QUEUE] =
@@ -1037,7 +1037,7 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)
 	return;
 }
 
-static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)
+static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)
 {
 	u32 value;
 	struct atl1e_hw *hw = &adapter->hw;

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ MODULE_DESCRIPTION("Atheros 1000M Ethernet Network Driver");`
`47`	`47`	`MODULE_LICENSE("GPL");`
`48`	`48`	`MODULE_VERSION(DRV_VERSION);`
`49`	`49`
`50`		`-static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);`
	`50`	`+static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter);`
`51`	`51`
`52`	`52`	`static const u16`
`53`	`53`	`atl1e_rx_page_vld_regs[AT_MAX_RECEIVE_QUEUE][AT_PAGE_NUM_PER_QUEUE] =`
`@@ -1037,7 +1037,7 @@ static inline void atl1e_configure_dma(struct atl1e_adapter *adapter)`
`1037`	`1037`	`return;`
`1038`	`1038`	`}`
`1039`	`1039`
`1040`		`-static inline void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)`
	`1040`	`+static void atl1e_setup_mac_ctrl(struct atl1e_adapter *adapter)`
`1041`	`1041`	`{`
`1042`	`1042`	`u32 value;`
`1043`	`1043`	`struct atl1e_hw *hw = &adapter->hw;`