tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

Jeff Garzik 7c239975 f07ef395

+6 -8
unified split
+2 -2
arch/sparc/kernel/irq.c
··· 479 480 extern void floppy_hardint(void); 481 482 - static irqreturn_t (*floppy_irq_handler)(int irq, void *dev_id); 483 484 void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) 485 { ··· 500 } 501 502 int sparc_floppy_request_irq(int irq, unsigned long flags, 503 - irqreturn_t (*irq_handler)(int irq, void *)) 504 { 505 floppy_irq_handler = irq_handler; 506 return request_fast_irq(irq, floppy_hardint, flags, "floppy");
··· 479 480 extern void floppy_hardint(void); 481 482 + static irq_handler_t floppy_irq_handler; 483 484 void sparc_floppy_irq(int irq, void *dev_id, struct pt_regs *regs) 485 { ··· 500 } 501 502 int sparc_floppy_request_irq(int irq, unsigned long flags, 503 + irq_handler_t irq_handler) 504 { 505 floppy_irq_handler = irq_handler; 506 return request_fast_irq(irq, floppy_hardint, flags, "floppy");
+2 -2
arch/x86/xen/events.c
··· 383 } 384 385 int bind_evtchn_to_irqhandler(unsigned int evtchn, 386 - irqreturn_t (*handler)(int, void *), 387 unsigned long irqflags, 388 const char *devname, void *dev_id) 389 { ··· 402 EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler); 403 404 int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, 405 - irqreturn_t (*handler)(int, void *), 406 unsigned long irqflags, const char *devname, void *dev_id) 407 { 408 unsigned int irq;
··· 383 } 384 385 int bind_evtchn_to_irqhandler(unsigned int evtchn, 386 + irq_handler_t handler, 387 unsigned long irqflags, 388 const char *devname, void *dev_id) 389 { ··· 402 EXPORT_SYMBOL_GPL(bind_evtchn_to_irqhandler); 403 404 int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, 405 + irq_handler_t handler, 406 unsigned long irqflags, const char *devname, void *dev_id) 407 { 408 unsigned int irq;
+1 -3
drivers/net/cxgb3/adapter.h
··· 46 #include <asm/semaphore.h> 47 #include <asm/io.h> 48 49 - typedef irqreturn_t(*intr_handler_t) (int, void *); 50 - 51 struct vlan_group; 52 struct adapter; 53 struct sge_qset; ··· 268 void t3_sge_stop(struct adapter *adap); 269 void t3_free_sge_resources(struct adapter *adap); 270 void t3_sge_err_intr_handler(struct adapter *adapter); 271 - intr_handler_t t3_intr_handler(struct adapter *adap, int polling); 272 int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev); 273 int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb); 274 void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p);
··· 46 #include <asm/semaphore.h> 47 #include <asm/io.h> 48 49 struct vlan_group; 50 struct adapter; 51 struct sge_qset; ··· 270 void t3_sge_stop(struct adapter *adap); 271 void t3_free_sge_resources(struct adapter *adap); 272 void t3_sge_err_intr_handler(struct adapter *adapter); 273 + irq_handler_t t3_intr_handler(struct adapter *adap, int polling); 274 int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev); 275 int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb); 276 void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p);
+1 -1
drivers/net/cxgb3/sge.c
··· 2431 * (MSI-X, MSI, or legacy) and whether NAPI will be used to service the 2432 * response queues. 2433 */ 2434 - intr_handler_t t3_intr_handler(struct adapter *adap, int polling) 2435 { 2436 if (adap->flags & USING_MSIX) 2437 return polling ? t3_sge_intr_msix_napi : t3_sge_intr_msix;
··· 2431 * (MSI-X, MSI, or legacy) and whether NAPI will be used to service the 2432 * response queues. 2433 */ 2434 + irq_handler_t t3_intr_handler(struct adapter *adap, int polling) 2435 { 2436 if (adap->flags & USING_MSIX) 2437 return polling ? t3_sge_intr_msix_napi : t3_sge_intr_msix;