aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/cxgb3
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-19 03:12:20 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-23 19:53:17 -0400
commit7c2399756ab8ccb2c57da4630b4aa4a1d61b3846 (patch)
treed201140b6c42c92a1f283707861e824935ea0e39 /drivers/net/cxgb3
parentf07ef395ad4cd050e695edfec217ceb2158220a3 (diff)
[SPARC, XEN, NET/CXGB3] use irq_handler_t where appropriate
Rather than hand-rolling our own prototype, make the code more future-proof by using the standard irq_handler_t typedef. Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r--drivers/net/cxgb3/adapter.h4
-rw-r--r--drivers/net/cxgb3/sge.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 2a3df145850..60a62f510db 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -46,8 +46,6 @@
46#include <asm/semaphore.h> 46#include <asm/semaphore.h>
47#include <asm/io.h> 47#include <asm/io.h>
48 48
49typedef irqreturn_t(*intr_handler_t) (int, void *);
50
51struct vlan_group; 49struct vlan_group;
52struct adapter; 50struct adapter;
53struct sge_qset; 51struct sge_qset;
@@ -270,7 +268,7 @@ void t3_sge_start(struct adapter *adap);
270void t3_sge_stop(struct adapter *adap); 268void t3_sge_stop(struct adapter *adap);
271void t3_free_sge_resources(struct adapter *adap); 269void t3_free_sge_resources(struct adapter *adap);
272void t3_sge_err_intr_handler(struct adapter *adapter); 270void t3_sge_err_intr_handler(struct adapter *adapter);
273intr_handler_t t3_intr_handler(struct adapter *adap, int polling); 271irq_handler_t t3_intr_handler(struct adapter *adap, int polling);
274int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev); 272int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev);
275int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb); 273int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb);
276void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p); 274void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p);
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index 994b5d6404d..c15e43a8543 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -2431,7 +2431,7 @@ static irqreturn_t t3b_intr_napi(int irq, void *cookie)
2431 * (MSI-X, MSI, or legacy) and whether NAPI will be used to service the 2431 * (MSI-X, MSI, or legacy) and whether NAPI will be used to service the
2432 * response queues. 2432 * response queues.
2433 */ 2433 */
2434intr_handler_t t3_intr_handler(struct adapter *adap, int polling) 2434irq_handler_t t3_intr_handler(struct adapter *adap, int polling)
2435{ 2435{
2436 if (adap->flags & USING_MSIX) 2436 if (adap->flags & USING_MSIX)
2437 return polling ? t3_sge_intr_msix_napi : t3_sge_intr_msix; 2437 return polling ? t3_sge_intr_msix_napi : t3_sge_intr_msix;