diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/chelsio/espi.c | 2 | ||||
-rw-r--r-- | drivers/net/chelsio/espi.h | 1 | ||||
-rw-r--r-- | drivers/net/chelsio/sge.c | 4 | ||||
-rw-r--r-- | drivers/net/chelsio/sge.h | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/chelsio/espi.c b/drivers/net/chelsio/espi.c index d7c5406a6c3f..1e0749e000b0 100644 --- a/drivers/net/chelsio/espi.c +++ b/drivers/net/chelsio/espi.c | |||
@@ -297,6 +297,7 @@ struct peespi *t1_espi_create(adapter_t *adapter) | |||
297 | return espi; | 297 | return espi; |
298 | } | 298 | } |
299 | 299 | ||
300 | #if 0 | ||
300 | void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val) | 301 | void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val) |
301 | { | 302 | { |
302 | struct peespi *espi = adapter->espi; | 303 | struct peespi *espi = adapter->espi; |
@@ -309,6 +310,7 @@ void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val) | |||
309 | writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL); | 310 | writel(espi->misc_ctrl, adapter->regs + A_ESPI_MISC_CONTROL); |
310 | spin_unlock(&espi->lock); | 311 | spin_unlock(&espi->lock); |
311 | } | 312 | } |
313 | #endif /* 0 */ | ||
312 | 314 | ||
313 | u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait) | 315 | u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait) |
314 | { | 316 | { |
diff --git a/drivers/net/chelsio/espi.h b/drivers/net/chelsio/espi.h index 84f2c98bc4cc..5694aad4fbc0 100644 --- a/drivers/net/chelsio/espi.h +++ b/drivers/net/chelsio/espi.h | |||
@@ -62,7 +62,6 @@ void t1_espi_intr_disable(struct peespi *); | |||
62 | int t1_espi_intr_handler(struct peespi *); | 62 | int t1_espi_intr_handler(struct peespi *); |
63 | const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi); | 63 | const struct espi_intr_counts *t1_espi_get_intr_counts(struct peespi *espi); |
64 | 64 | ||
65 | void t1_espi_set_misc_ctrl(adapter_t *adapter, u32 val); | ||
66 | u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait); | 65 | u32 t1_espi_get_mon(adapter_t *adapter, u32 addr, u8 wait); |
67 | int t1_espi_get_mon_t204(adapter_t *, u32 *, u8); | 66 | int t1_espi_get_mon_t204(adapter_t *, u32 *, u8); |
68 | 67 | ||
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index b301c0428ae0..8a7efd38e95b 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
@@ -330,6 +330,8 @@ unsigned int t1_sched_update_parms(struct sge *sge, unsigned int port, | |||
330 | return max_avail_segs * (p->mtu - 40); | 330 | return max_avail_segs * (p->mtu - 40); |
331 | } | 331 | } |
332 | 332 | ||
333 | #if 0 | ||
334 | |||
333 | /* | 335 | /* |
334 | * t1_sched_max_avail_bytes() tells the scheduler the maximum amount of | 336 | * t1_sched_max_avail_bytes() tells the scheduler the maximum amount of |
335 | * data that can be pushed per port. | 337 | * data that can be pushed per port. |
@@ -357,6 +359,8 @@ void t1_sched_set_drain_bits_per_us(struct sge *sge, unsigned int port, | |||
357 | t1_sched_update_parms(sge, port, 0, 0); | 359 | t1_sched_update_parms(sge, port, 0, 0); |
358 | } | 360 | } |
359 | 361 | ||
362 | #endif /* 0 */ | ||
363 | |||
360 | 364 | ||
361 | /* | 365 | /* |
362 | * get_clock() implements a ns clock (see ktime_get) | 366 | * get_clock() implements a ns clock (see ktime_get) |
diff --git a/drivers/net/chelsio/sge.h b/drivers/net/chelsio/sge.h index cced9dff91c5..8c9405123992 100644 --- a/drivers/net/chelsio/sge.h +++ b/drivers/net/chelsio/sge.h | |||
@@ -88,8 +88,6 @@ void t1_sge_intr_disable(struct sge *); | |||
88 | void t1_sge_intr_clear(struct sge *); | 88 | void t1_sge_intr_clear(struct sge *); |
89 | const struct sge_intr_counts *t1_sge_get_intr_counts(const struct sge *sge); | 89 | const struct sge_intr_counts *t1_sge_get_intr_counts(const struct sge *sge); |
90 | void t1_sge_get_port_stats(const struct sge *sge, int port, struct sge_port_stats *); | 90 | void t1_sge_get_port_stats(const struct sge *sge, int port, struct sge_port_stats *); |
91 | void t1_sched_set_max_avail_bytes(struct sge *, unsigned int); | ||
92 | void t1_sched_set_drain_bits_per_us(struct sge *, unsigned int, unsigned int); | ||
93 | unsigned int t1_sched_update_parms(struct sge *, unsigned int, unsigned int, | 91 | unsigned int t1_sched_update_parms(struct sge *, unsigned int, unsigned int, |
94 | unsigned int); | 92 | unsigned int); |
95 | 93 | ||