diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-08-08 14:33:34 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-14 04:43:40 -0400 |
commit | 1595ab5d7d99bc6c9a5548ab3fb83e278eeae409 (patch) | |
tree | 5392d4ea2ca259ee19b90fb01b3c8e465f767349 /drivers/net/atl1e | |
parent | 11d89d639352ef27bb3f0e7513dd406284bf034a (diff) |
[netdrvr] uninline atl1e_setup_mac_ctrl()
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>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/atl1e')
-rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 35264c244cfd..82d7be1655d3 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"); | |||
47 | MODULE_LICENSE("GPL"); | 47 | MODULE_LICENSE("GPL"); |
48 | MODULE_VERSION(DRV_VERSION); | 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 | static const u16 | 52 | static const u16 |
53 | atl1e_rx_page_vld_regs[AT_MAX_RECEIVE_QUEUE][AT_PAGE_NUM_PER_QUEUE] = | 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 | return; | 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 | u32 value; | 1042 | u32 value; |
1043 | struct atl1e_hw *hw = &adapter->hw; | 1043 | struct atl1e_hw *hw = &adapter->hw; |