diff options
| author | Alexander Duyck <alexander.h.duyck@intel.com> | 2011-07-14 23:06:06 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-09-16 00:19:47 -0400 |
| commit | 54239c67dba1ec168736c7f31b65638bfe535386 (patch) | |
| tree | 36e1abf2900467ffd245f8528661458cccde3cee | |
| parent | 35c7f8a1baa6245a0e66d6ee72502d96cbc2aa19 (diff) | |
ixgbe: combine PCI_VDEVICE and board declaration to same line
This patch is a minor whitespace cleanup to compress the device ID
declaration and board type declaration onto the same line. It seems to
make sense since all of the combinations of the two are less than 80
characters and it makes the overall layout a bit more readable.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 79 |
1 files changed, 26 insertions, 53 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index dd1b57ba190a..fee5630b7526 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
| @@ -79,59 +79,32 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = { | |||
| 79 | * Class, Class Mask, private data (not used) } | 79 | * Class, Class Mask, private data (not used) } |
| 80 | */ | 80 | */ |
| 81 | static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { | 81 | static DEFINE_PCI_DEVICE_TABLE(ixgbe_pci_tbl) = { |
| 82 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598), | 82 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598), board_82598 }, |
| 83 | board_82598 }, | 83 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT), board_82598 }, |
| 84 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT), | 84 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT), board_82598 }, |
| 85 | board_82598 }, | 85 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT), board_82598 }, |
| 86 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT), | 86 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2), board_82598 }, |
| 87 | board_82598 }, | 87 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4), board_82598 }, |
| 88 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT), | 88 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT), board_82598 }, |
| 89 | board_82598 }, | 89 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT), board_82598 }, |
| 90 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AT2), | 90 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM), board_82598 }, |
| 91 | board_82598 }, | 91 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR), board_82598 }, |
| 92 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_CX4), | 92 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM), board_82598 }, |
| 93 | board_82598 }, | 93 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX), board_82598 }, |
| 94 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_CX4_DUAL_PORT), | 94 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4), board_82599 }, |
| 95 | board_82598 }, | 95 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM), board_82599 }, |
| 96 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_DA_DUAL_PORT), | 96 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR), board_82599 }, |
| 97 | board_82598 }, | 97 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), board_82599 }, |
| 98 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_SR_DUAL_PORT_EM), | 98 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM), board_82599 }, |
| 99 | board_82598 }, | 99 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ), board_82599 }, |
| 100 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_XF_LR), | 100 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4), board_82599 }, |
| 101 | board_82598 }, | 101 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE), board_82599 }, |
| 102 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM), | 102 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE), board_82599 }, |
| 103 | board_82598 }, | 103 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM), board_82599 }, |
| 104 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX), | 104 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE), board_82599 }, |
| 105 | board_82598 }, | 105 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T), board_X540 }, |
| 106 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4), | 106 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), board_82599 }, |
| 107 | board_82599 }, | 107 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), board_82599 }, |
| 108 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_XAUI_LOM), | ||
| 109 | board_82599 }, | ||
| 110 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR), | ||
| 111 | board_82599 }, | ||
| 112 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), | ||
| 113 | board_82599 }, | ||
| 114 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM), | ||
| 115 | board_82599 }, | ||
| 116 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KX4_MEZZ), | ||
| 117 | board_82599 }, | ||
| 118 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_CX4), | ||
| 119 | board_82599 }, | ||
| 120 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_BACKPLANE_FCOE), | ||
| 121 | board_82599 }, | ||
| 122 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_FCOE), | ||
| 123 | board_82599 }, | ||
| 124 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_T3_LOM), | ||
| 125 | board_82599 }, | ||
| 126 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_COMBO_BACKPLANE), | ||
| 127 | board_82599 }, | ||
| 128 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X540T), | ||
| 129 | board_X540 }, | ||
| 130 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_SF2), | ||
| 131 | board_82599 }, | ||
| 132 | {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_LS), | ||
| 133 | board_82599 }, | ||
| 134 | |||
| 135 | /* required last entry */ | 108 | /* required last entry */ |
| 136 | {0, } | 109 | {0, } |
| 137 | }; | 110 | }; |