[2.6 patch] uninline atl1e_setup_mac_ctrl()

[2.6 patch] uninline atl1e_setup_mac_ctrl()

[Adrian Bunk]

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:

<--  snip  -->

...
  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
make[4]: *** [drivers/net/atl1e/atl1e_main.o] Error 1

<--  snip  -->

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Adrian Bunk <bunk@kernel.org>

---
9b6daf38d2e48b275573fc54e7d2a498fac277cf 
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 35264c2..82d7be1 100644
--- 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;

Re: [2.6 patch] uninline atl1e_setup_mac_ctrl()

[Jeff Garzik]

Adrian Bunk wrote:
> 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:
> 
> <--  snip  -->
> 
> ...
>   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
> make[4]: *** [drivers/net/atl1e/atl1e_main.o] Error 1
> 
> <--  snip  -->
> 
> Reported-by: Adrian Bunk <bunk@kernel.org>
> Signed-off-by: Adrian Bunk <bunk@kernel.org>

applied