aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/chelsio/cxgb2.c2
-rw-r--r--drivers/net/chelsio/espi.c2
-rw-r--r--drivers/net/chelsio/pm3393.c16
-rw-r--r--drivers/net/chelsio/subr.c12
4 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 37037e5890e1..1d78d5d4b1a7 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -729,7 +729,7 @@ static int get_coalesce(struct net_device *dev, struct ethtool_coalesce *c)
729 729
730static int get_eeprom_len(struct net_device *dev) 730static int get_eeprom_len(struct net_device *dev)
731{ 731{
732 return EEPROM_SIZE; 732 return EEPROM_SIZE;
733} 733}
734 734
735#define EEPROM_MAGIC(ap) \ 735#define EEPROM_MAGIC(ap) \
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c
index 542e5e065c6f..40af47b795e6 100644
--- a/drivers/net/chelsio/espi.c
+++ b/drivers/net/chelsio/espi.c
@@ -192,7 +192,7 @@ int t1_espi_intr_handler(struct peespi *espi)
192 192
193const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi) 193const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi)
194{ 194{
195 return &espi->intr_cnt; 195 return &espi->intr_cnt;
196} 196}
197 197
198static void espi_setup_for_pm3393(adapter_t *adapter) 198static void espi_setup_for_pm3393(adapter_t *adapter)
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c
index 04a1404fc65e..b442b585b4b1 100644
--- a/drivers/net/chelsio/pm3393.c
+++ b/drivers/net/chelsio/pm3393.c
@@ -46,17 +46,17 @@
46/* 802.3ae 10Gb/s MDIO Manageable Device(MMD) 46/* 802.3ae 10Gb/s MDIO Manageable Device(MMD)
47 */ 47 */
48enum { 48enum {
49 MMD_RESERVED, 49 MMD_RESERVED,
50 MMD_PMAPMD, 50 MMD_PMAPMD,
51 MMD_WIS, 51 MMD_WIS,
52 MMD_PCS, 52 MMD_PCS,
53 MMD_PHY_XGXS, /* XGMII Extender Sublayer */ 53 MMD_PHY_XGXS, /* XGMII Extender Sublayer */
54 MMD_DTE_XGXS, 54 MMD_DTE_XGXS,
55}; 55};
56 56
57enum { 57enum {
58 PHY_XGXS_CTRL_1, 58 PHY_XGXS_CTRL_1,
59 PHY_XGXS_STATUS_1 59 PHY_XGXS_STATUS_1
60}; 60};
61 61
62#define OFFSET(REG_ADDR) (REG_ADDR << 2) 62#define OFFSET(REG_ADDR) (REG_ADDR << 2)
diff --git a/drivers/net/chelsio/subr.c b/drivers/net/chelsio/subr.c
index 12e4e96dba2d..e4473ec43d26 100644
--- a/drivers/net/chelsio/subr.c
+++ b/drivers/net/chelsio/subr.c
@@ -166,11 +166,11 @@ static int t1_pci_intr_handler(adapter_t *adapter)
166{ 166{
167 u32 pcix_cause; 167 u32 pcix_cause;
168 168
169 pci_read_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, &pcix_cause); 169 pci_read_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, &pcix_cause);
170 170
171 if (pcix_cause) { 171 if (pcix_cause) {
172 pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE, 172 pci_write_config_dword(adapter->pdev, A_PCICFG_INTR_CAUSE,
173 pcix_cause); 173 pcix_cause);
174 t1_fatal_err(adapter); /* PCI errors are fatal */ 174 t1_fatal_err(adapter); /* PCI errors are fatal */
175 } 175 }
176 return 0; 176 return 0;
@@ -420,9 +420,9 @@ int t1_link_start(struct cphy *phy, struct cmac *mac, struct link_config *lc)
420 */ 420 */
421int elmer0_ext_intr_handler(adapter_t *adapter) 421int elmer0_ext_intr_handler(adapter_t *adapter)
422{ 422{
423 struct cphy *phy; 423 struct cphy *phy;
424 int phy_cause; 424 int phy_cause;
425 u32 cause; 425 u32 cause;
426 426
427 t1_tpi_read(adapter, A_ELMER0_INT_CAUSE, &cause); 427 t1_tpi_read(adapter, A_ELMER0_INT_CAUSE, &cause);
428 428
@@ -515,7 +515,7 @@ void t1_interrupts_clear(adapter_t* adapter)
515 } 515 }
516 516
517 /* Enable interrupts for external devices. */ 517 /* Enable interrupts for external devices. */
518 pl_intr = readl(adapter->regs + A_PL_CAUSE); 518 pl_intr = readl(adapter->regs + A_PL_CAUSE);
519 519
520 writel(pl_intr | F_PL_INTR_EXT | F_PL_INTR_PCIX, 520 writel(pl_intr | F_PL_INTR_EXT | F_PL_INTR_PCIX,
521 adapter->regs + A_PL_CAUSE); 521 adapter->regs + A_PL_CAUSE);
@@ -643,7 +643,7 @@ static int board_init(adapter_t *adapter, const struct board_info *bi)
643 case CHBT_BOARD_N110: 643 case CHBT_BOARD_N110:
644 case CHBT_BOARD_N210: 644 case CHBT_BOARD_N210:
645 writel(V_TPIPAR(0xf), adapter->regs + A_TPI_PAR); 645 writel(V_TPIPAR(0xf), adapter->regs + A_TPI_PAR);
646 t1_tpi_write(adapter, A_ELMER0_GPO, 0x800); 646 t1_tpi_write(adapter, A_ELMER0_GPO, 0x800);
647 break; 647 break;
648 } 648 }
649 return 0; 649 return 0;