Commit 43ced651 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

ixgbe section fixes

ixgbe_init_interrupt_scheme() is called from ixgbe_resume().  Build that
with CONFIG_PM and without CONFIG_HOTPLUG and you've got a problem.
Several helpers called by it also are misannotated __devinit.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 31421a6f
...@@ -2330,7 +2330,7 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter, ...@@ -2330,7 +2330,7 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter,
* Once we know the feature-set enabled for the device, we'll cache * Once we know the feature-set enabled for the device, we'll cache
* the register offset the descriptor ring is assigned to. * the register offset the descriptor ring is assigned to.
**/ **/
static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) static void ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
{ {
int feature_mask = 0, rss_i; int feature_mask = 0, rss_i;
int i, txr_idx, rxr_idx; int i, txr_idx, rxr_idx;
...@@ -2367,7 +2367,7 @@ static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter) ...@@ -2367,7 +2367,7 @@ static void __devinit ixgbe_cache_ring_register(struct ixgbe_adapter *adapter)
* number of queues at compile-time. The polling_netdev array is * number of queues at compile-time. The polling_netdev array is
* intended for Multiqueue, but should work fine with a single queue. * intended for Multiqueue, but should work fine with a single queue.
**/ **/
static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter) static int ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
{ {
int i; int i;
...@@ -2408,8 +2408,7 @@ static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter) ...@@ -2408,8 +2408,7 @@ static int __devinit ixgbe_alloc_queues(struct ixgbe_adapter *adapter)
* Attempt to configure the interrupts using the best available * Attempt to configure the interrupts using the best available
* capabilities of the hardware and the kernel. * capabilities of the hardware and the kernel.
**/ **/
static int __devinit ixgbe_set_interrupt_capability(struct ixgbe_adapter static int ixgbe_set_interrupt_capability(struct ixgbe_adapter *adapter)
*adapter)
{ {
int err = 0; int err = 0;
int vector, v_budget; int vector, v_budget;
...@@ -2501,7 +2500,7 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter) ...@@ -2501,7 +2500,7 @@ static void ixgbe_reset_interrupt_capability(struct ixgbe_adapter *adapter)
* - Hardware queue count (num_*_queues) * - Hardware queue count (num_*_queues)
* - defined by miscellaneous hardware support/features (RSS, etc.) * - defined by miscellaneous hardware support/features (RSS, etc.)
**/ **/
static int __devinit ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter) static int ixgbe_init_interrupt_scheme(struct ixgbe_adapter *adapter)
{ {
int err; int err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment