parport: Consolidate code copies into a single generic irq handler
Subsystems (7)
PATCH 1/3 parport: Consolidate code copies into a single generic irq handler
commit 73ae204aa2b83cee2a9156ff72ef1da99612074e
Author: Jeff Garzik <[email protected]> Date: Fri Oct 19 01:42:14 2007 -0400
[PARPORT] Consolidate code copies into a single generic irq handler
Several arches used the exact same code for their parport irq handling. Make that code generic, in parport_irq_handler().
Also, s/__inline__/inline/ in include/linux/parport.h.
drivers/parport/parport_amiga.c | 9 +-------- drivers/parport/parport_atari.c | 9 +-------- drivers/parport/parport_ax88796.c | 10 +--------- drivers/parport/parport_gsc.c | 8 +------- drivers/parport/parport_ip32.c | 6 ++++-- drivers/parport/parport_pc.c | 9 +-------- drivers/parport/parport_sunbpp.c | 8 +------- drivers/parport/share.c | 10 ++++++++++ include/linux/parport.h | 6 +++++- 9 files changed, 25 insertions(+), 50 deletions(-)
73ae204aa2b83cee2a9156ff72ef1da99612074e
drivers/parport/parport_amiga.c +1 -8
@@ -137,13 +137,6 @@ static unsigned char amiga_read_status(struct parport *p)return status; } -/* as this ports irq handling is already done, we use a generic funktion */ -static irqreturn_t amiga_interrupt (int irq,void *dev_id) -{ -parport_generic_irq (irq, (struct parport *) dev_id); -return IRQ_HANDLED ; -} -static void amiga_enable_irq (struct parport *p) {enable_irq (IRQ_AMIGA_CIAA_FLG );
@@ -255,7 +248,7 @@ static int __init parport_amiga_init(void)if (!p) goto out_port; - err =request_irq (IRQ_AMIGA_CIAA_FLG , amiga_interrupt,0 , p->name, p); + err =request_irq (IRQ_AMIGA_CIAA_FLG , parport_irq_handler,0 , p->name, p);if (err) goto out_irq;
drivers/parport/parport_atari.c +1 -8
@@ -103,13 +103,6 @@ parport_atari_restore_state(struct parport *p, struct parport_state *s) { } -static irqreturn_t -parport_atari_interrupt (int irq,void *dev_id) -{ -parport_generic_irq (irq, (struct parport *) dev_id); -return IRQ_HANDLED ; -} -static void parport_atari_enable_irq (struct parport *p) {
@@ -208,7 +201,7 @@ static int __init parport_atari_init(void) &parport_atari_ops);if (!p)return -ENODEV ; -if (request_irq (IRQ_MFP_BUSY , parport_atari_interrupt, +if (request_irq (IRQ_MFP_BUSY , parport_irq_handler,IRQ_TYPE_SLOW , p->name, p)) {parport_put_port (p);return -ENODEV ;
drivers/parport/parport_ax88796.c +1 -9
@@ -232,14 +232,6 @@ parport_ax88796_restore_state(struct parport *p, struct parport_state *s)writeb (s->u.ax88796.cpr, dd->spp_cpr); } -static irqreturn_t -parport_ax88796_interrupt (int irq,void *dev_id) -{ -parport_generic_irq (irq, dev_id); -return IRQ_HANDLED ; -} - -static struct parport_operations parport_ax88796_ops = { .write_data = parport_ax88796_write_data, .read_data = parport_ax88796_read_data,
@@ -344,7 +336,7 @@ static int parport_ax88796_probe(struct platform_device *pdev)if (irq >=0 ) {/* request irq */ - ret =request_irq (irq, parport_ax88796_interrupt, + ret =request_irq (irq, parport_irq_handler,IRQF_TRIGGER_FALLING , pdev->name, pp);if (ret <0 )
drivers/parport/parport_gsc.c +1 -7
@@ -80,12 +80,6 @@ static int clear_epp_timeout(struct parport *pb)* of these are in parport_gsc.h. */ -static irqreturn_t parport_gsc_interrupt (int irq,void *dev_id) -{ -parport_generic_irq (irq, (struct parport *) dev_id); -return IRQ_HANDLED ; -} -void parport_gsc_init_state (struct pardevice *dev,struct parport_state *s) { s->u.pc.ctr =0xc | (dev->irq_func ?0x10 :0x0 );
@@ -324,7 +318,7 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,printk ("]\n" );if (p->irq !=PARPORT_IRQ_NONE ) { -if (request_irq (p->irq, parport_gsc_interrupt, +if (request_irq (p->irq, parport_irq_handler,0 , p->name, p)) { printk (KERN_WARNING "%s: irq %d in use, " "resorting to polled operation\n",
drivers/parport/parport_ip32.c +4 -2
@@ -778,14 +778,16 @@ static irqreturn_t parport_ip32_interrupt(int irq, void *dev_id)struct parport *const p = dev_id;struct parport_ip32_private *const priv = p->physport->private_data;enum parport_ip32_irq_mode irq_mode = priv->irq_mode; +switch (irq_mode) {case PARPORT_IP32_IRQ_FWD : -parport_generic_irq (irq, p); -break ; +return parport_irq_handler (irq, dev_id); +case PARPORT_IP32_IRQ_HERE :parport_ip32_wakeup (p);break ; } +return IRQ_HANDLED ; }
drivers/parport/parport_pc.c +1 -8
@@ -272,13 +272,6 @@ static int clear_epp_timeout(struct parport *pb)* of these are in parport_pc.h. */ -static irqreturn_t parport_pc_interrupt (int irq,void *dev_id) -{ -parport_generic_irq (irq, (struct parport *) dev_id); -/* FIXME! Was it really ours? */ -return IRQ_HANDLED ; -} -static void parport_pc_init_state (struct pardevice *dev,struct parport_state *s) { s->u.pc.ctr =0xc ;
@@ -2301,7 +2294,7 @@ struct parport *parport_pc_probe_port (unsigned long int base, EPP_res =NULL ; }if (p->irq !=PARPORT_IRQ_NONE ) { -if (request_irq (p->irq, parport_pc_interrupt, +if (request_irq (p->irq, parport_irq_handler,0 , p->name, p)) { printk (KERN_WARNING "%s: irq %d in use, " "resorting to polled operation\n",
drivers/parport/parport_sunbpp.c +1 -7
@@ -46,12 +46,6 @@#define dprintk (x)#endif -static irqreturn_t parport_sunbpp_interrupt (int irq,void *dev_id) -{ -parport_generic_irq (irq, (struct parport *) dev_id); -return IRQ_HANDLED ; -} -static void parport_sunbpp_disable_irq (struct parport *p) {struct bpp_regs __iomem *regs = (struct bpp_regs __iomem *)p->base;
@@ -324,7 +318,7 @@ static int __devinit init_one_port(struct sbus_dev *sdev) p->size = size; p->dev = &sdev->ofdev.dev; -if ((err =request_irq (p->irq, parport_sunbpp_interrupt, +if ((err =request_irq (p->irq, parport_irq_handler,IRQF_SHARED , p->name, p)) !=0 ) { goto out_put_port; }
drivers/parport/share.c +10 -0
@@ -995,6 +995,15 @@ void parport_release(struct pardevice *dev) } } +irqreturn_t parport_irq_handler (int irq,void *dev_id) +{ +struct parport *port = dev_id; + +parport_generic_irq (irq, port); + +return IRQ_HANDLED ; +} +/* Exported symbols for modules. */ EXPORT_SYMBOL (parport_claim);
@@ -1011,5 +1020,6 @@ EXPORT_SYMBOL(parport_get_port);EXPORT_SYMBOL (parport_put_port);EXPORT_SYMBOL (parport_find_number);EXPORT_SYMBOL (parport_find_base); +EXPORT_SYMBOL (parport_irq_handler);MODULE_LICENSE ("GPL" );
include/linux/parport.h +5 -1
@@ -100,6 +100,7 @@ typedef enum {#include <linux/proc_fs.h> #include <linux/spinlock.h> #include <linux/wait.h> +#include <linux/irqreturn.h> #include <asm/system.h> #include <asm/ptrace.h> #include <asm/semaphore.h>
@@ -366,6 +367,9 @@ extern void parport_unregister_driver (struct parport_driver *);extern struct parport *parport_find_number (int );extern struct parport *parport_find_base (unsigned long ); +/* generic irq handler, if it suits your needs */ +extern irqreturn_t parport_irq_handler (int irq,void *dev_id); +/* Reference counting for ports. */ extern struct parport *parport_get_port (struct parport *);extern void parport_put_port (struct parport *);
@@ -514,7 +518,7 @@ extern void parport_daisy_deselect_all (struct parport *port);extern int parport_daisy_select (struct parport *port,int daisy,int mode);/* Lowlevel drivers _can_ call this support function to handle irqs. */ -static __inline__void parport_generic_irq (int irq,struct parport *port) +static inline void parport_generic_irq (int irq,struct parport *port) {parport_ieee1284_interrupt (irq, port);read_lock (&port->cad_lock);
PATCH 2/3 parport: Kill useless 'irq' arg from parport_{generic_irq,ieee1284_interrupt
commit 69a4a1aad140a3d9e17d3e313a3633445a7934fe
Author: Jeff Garzik <[email protected]> Date: Fri Oct 19 01:56:02 2007 -0400
[PARPORT] Kill useless 'irq' arg from parport_{generic_irq,ieee1284_interrupt}
parport_ieee1284_interrupt() was not using its first arg at all. Delete.
parport_generic_irq()'s second arg makes its first arg completely redundant. Delete, and use port->irq in the one place where we actually need it.
Also, s/__inline__/inline/ to make the code look nicer.
drivers/parport/ieee1284.c | 2 +- drivers/parport/parport_mfc3.c | 2 +- drivers/parport/share.c | 2 +- drivers/usb/misc/uss720.c | 4 ++-- include/linux/parport.h | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-)
69a4a1aad140a3d9e17d3e313a3633445a7934fe
drivers/parport/ieee1284.c +1 -1
@@ -571,7 +571,7 @@ static int parport_ieee1284_ack_data_avail (struct parport *port)#endif /* IEEE1284 support */ /* Handle an interrupt. */ -void parport_ieee1284_interrupt (int which,void *handle) +void parport_ieee1284_interrupt (void *handle) {struct parport *port = handle;parport_ieee1284_wakeup (port);
drivers/parport/parport_mfc3.c +1 -1
@@ -219,7 +219,7 @@ static irqreturn_t mfc3_interrupt(int irq, void *dev_id)if (this_port[i] !=NULL )if (pia (this_port[i])->crb &128 ) {/* Board caused interrupt */ dummy =pia (this_port[i])->pprb;/* clear irq bit */ -parport_generic_irq (irq, this_port[i]); +parport_generic_irq (this_port[i]); }return IRQ_HANDLED ; }
drivers/parport/share.c +1 -1
@@ -999,7 +999,7 @@ irqreturn_t parport_irq_handler(int irq, void *dev_id) {struct parport *port = dev_id; -parport_generic_irq (irq, port); +parport_generic_irq (port);return IRQ_HANDLED ; }
drivers/usb/misc/uss720.c +2 -2
@@ -128,7 +128,7 @@ static void async_complete(struct urb *urb)#endif /* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ if (rq->reg[2 ] & rq->reg[1 ] &0x10 && pp) -parport_generic_irq (0 , pp); +parport_generic_irq (pp); }complete (&rq->compl);kref_put (&rq->ref_count, destroy_async);
@@ -337,7 +337,7 @@ static int uss720_irq(int usbstatus, void *buffer, int len, void *dev_id)memcpy (priv->reg, buffer,4 );/* if nAck interrupts are enabled and we have an interrupt, call the interrupt procedure */ if (priv->reg[2 ] & priv->reg[1 ] &0x10 ) -parport_generic_irq (0 , pp); +parport_generic_irq (pp); return 1; }#endif
include/linux/parport.h +4 -4
@@ -465,7 +465,7 @@ static __inline__ int parport_yield_blocking(struct pardevice *dev)#define PARPORT_FLAG_EXCL (1<<1)/* EXCL driver registered. */ /* IEEE1284 functions */ -extern void parport_ieee1284_interrupt (int ,void *); +extern void parport_ieee1284_interrupt (void *);extern int parport_negotiate (struct parport *,int mode);extern ssize_t parport_write (struct parport *,const void *buf,size_t len);extern ssize_t parport_read (struct parport *,void *buf,size_t len);
@@ -518,12 +518,12 @@ extern void parport_daisy_deselect_all (struct parport *port);extern int parport_daisy_select (struct parport *port,int daisy,int mode);/* Lowlevel drivers _can_ call this support function to handle irqs. */ -static inline void parport_generic_irq (int irq,struct parport *port) +static inline void parport_generic_irq (struct parport *port) { -parport_ieee1284_interrupt (irq, port); +parport_ieee1284_interrupt (port);read_lock (&port->cad_lock);if (port->cad && port->cad->irq_func) - port->cad->irq_func (irq, port->cad->private); + port->cad->irq_func (port->irq, port->cad->private);read_unlock (&port->cad_lock); }
PATCH 3/3 parport: Remove unused 'irq' argument from parport irq functions
In reply to Jeff Garzikcommit ed58d6e0a6e1ad61a7dde232de7a4891ebc99f61
Author: Jeff Garzik <[email protected]> Date: Fri Oct 19 02:54:26 2007 -0400
[PARPORT] Remove unused 'irq' argument from parport irq functions
None of the drivers with a struct pardevice's ->irq_func() hook ever used the 'irq' argument passed to it, so remove it.
drivers/char/ppdev.c | 4 ++-- drivers/input/serio/parkbd.c | 2 +- drivers/net/hamradio/baycom_epp.c | 8 +------- drivers/net/hamradio/baycom_par.c | 4 ++-- drivers/net/plip.c | 6 +++--- drivers/parport/daisy.c | 13 ++----------- drivers/parport/probe.c | 3 +-- drivers/parport/share.c | 2 +- include/linux/parport.h | 12 ++++-------- sound/drivers/mts64.c | 2 +- sound/drivers/portman2x4.c | 2 +- 11 files changed, 19 insertions(+), 39 deletions(-)
ed58d6e0a6e1ad61a7dde232de7a4891ebc99f61
drivers/char/ppdev.c +2 -2
@@ -267,9 +267,9 @@ static ssize_t pp_write (struct file * file, const char __user * buf,return bytes_written; } -static void pp_irq (int irq,void * private) +static void pp_irq (void *private) { -struct pp_struct * pp = (struct pp_struct *) private; +struct pp_struct *pp = private;if (pp->irqresponse) {parport_write_control (pp->pdev->port, pp->irqctl);
drivers/input/serio/parkbd.c +1 -1
@@ -102,7 +102,7 @@ static int parkbd_write(struct serio *port, unsigned char c)return 0 ; } -static void parkbd_interrupt (int irq,void *dev_id) +static void parkbd_interrupt (void *dev_id) {if (parkbd_writing) {
drivers/net/hamradio/baycom_epp.c +1 -7
@@ -325,12 +325,6 @@ static int eppconfig(struct baycom_state *bc)/* ---------------------------------------------------------------------- */ -static void epp_interrupt (int irq,void *dev_id) -{ -} - -/* ---------------------------------------------------------------------- */ -static inline void do_kiss_params (struct baycom_state *bc,unsigned char *data,unsigned long len) {
@@ -871,7 +865,7 @@ static int epp_open(struct net_device *dev) }memset (&bc->modem,0 ,sizeof (bc->modem)); bc->pdev =parport_register_device (pp, dev->name,NULL , epp_wakeup, - epp_interrupt,PARPORT_DEV_EXCL , dev); +NULL ,PARPORT_DEV_EXCL , dev);parport_put_port (pp);if (!bc->pdev) {printk (KERN_ERR "%s: cannot register parport at 0x%lx\n" , bc_drvname, pp->base);
drivers/net/hamradio/baycom_par.c +2 -2
@@ -270,9 +270,9 @@ static __inline__ void par96_rx(struct net_device *dev, struct baycom_state *bc)/* --------------------------------------------------------------------- */ -static void par96_interrupt (int irq,void *dev_id) +static void par96_interrupt (void *dev_id) { -struct net_device *dev = (struct net_device *)dev_id; +struct net_device *dev = dev_id;struct baycom_state *bc =netdev_priv (dev);baycom_int_freq (bc);
drivers/net/plip.c +3 -3
@@ -143,7 +143,7 @@ static void plip_bh(struct work_struct *work);static void plip_timer_bh (struct work_struct *work);/* Interrupt handler */ -static void plip_interrupt (int irq,void *dev_id); +static void plip_interrupt (void *dev_id);/* Functions for DEV methods */ static int plip_tx_packet (struct sk_buff *skb,struct net_device *dev);
@@ -380,7 +380,7 @@ plip_timer_bh(struct work_struct *work) container_of(work, struct net_local, timer.work);if (!(atomic_read (&nl->kill_timer))) { -plip_interrupt (-1 , nl->dev); +plip_interrupt (nl->dev);schedule_delayed_work (&nl->timer,1 ); }
@@ -897,7 +897,7 @@ plip_error(struct net_device *dev, struct net_local *nl,/* Handle the parallel port interrupts. */ static void -plip_interrupt (int irq,void *dev_id) +plip_interrupt (void *dev_id) {struct net_device *dev = dev_id;struct net_local *nl;
drivers/parport/daisy.c +2 -11
@@ -199,11 +199,6 @@ void parport_daisy_fini(struct parport *port)* parport_open - find a device by canonical device number * @devnum: canonical device number * @name: name to associate with the device -* @pf: preemption callback -* @kf: kick callback -* @irqf: interrupt handler -* @flags: registration flags -* @handle: driver data * * This function is similar to parport_register_device(), except * that it locates a device by its number rather than by the port
@@ -214,10 +209,7 @@ void parport_daisy_fini(struct parport *port)* for parport_register_device(). **/ -struct pardevice *parport_open (int devnum,const char *name, -int (*pf) (void *),void (*kf) (void *), -void (*irqf) (int ,void *), -int flags,void *handle) +struct pardevice *parport_open (int devnum,const char *name) {struct daisydev *p = topology;struct parport *port;
@@ -237,8 +229,7 @@ struct pardevice *parport_open(int devnum, const char *name, port =parport_get_port (p->port);spin_unlock (&topology_lock); - dev =parport_register_device (port, name, pf, kf, - irqf, flags, handle); + dev =parport_register_device (port, name,NULL ,NULL ,NULL ,0 ,NULL );parport_put_port (port);if (!dev)return NULL ;
drivers/parport/probe.c +1 -2
@@ -255,8 +255,7 @@ static ssize_t parport_read_device_id (struct parport *port, char *buffer,ssize_t parport_device_id (int devnum,char *buffer,size_t count) {ssize_t retval = -ENXIO ; -struct pardevice *dev =parport_open (devnum,"Device ID probe" , -NULL ,NULL ,NULL ,0 ,NULL ); +struct pardevice *dev =parport_open (devnum,"Device ID probe" );if (!dev)return -ENXIO ;
drivers/parport/share.c +1 -1
@@ -524,7 +524,7 @@ void parport_remove_port(struct parport *port)struct pardevice *parport_register_device (struct parport *port,const char *name,int (*pf)(void *),void (*kf)(void *), -void (*irq_func)(int ,void *), +void (*irq_func)(void *),int flags,void *handle) {struct pardevice *tmp;
include/linux/parport.h +4 -8
@@ -230,7 +230,7 @@ struct pardevice {int (*preempt)(void *);void (*wakeup)(void *);void *private; -void (*irq_func)(int ,void *); +void (*irq_func)(void *);unsigned int flags;struct pardevice *next;struct pardevice *prev;
@@ -383,7 +383,7 @@ extern void parport_put_port (struct parport *);struct pardevice *parport_register_device (struct parport *port,const char *name,int (*pf)(void *),void (*kf)(void *), -void (*irq_func)(int ,void *), +void (*irq_func)(void *),int flags,void *handle);/* parport_unregister unlinks a device from the chain. */
@@ -507,11 +507,7 @@ extern size_t parport_ieee1284_epp_read_addr (struct parport *,/* IEEE1284.3 functions */ extern int parport_daisy_init (struct parport *port);extern void parport_daisy_fini (struct parport *port); -extern struct pardevice *parport_open (int devnum,const char *name, -int (*pf) (void *), -void (*kf) (void *), -void (*irqf) (int ,void *), -int flags,void *handle); +extern struct pardevice *parport_open (int devnum,const char *name);extern void parport_close (struct pardevice *dev);extern ssize_t parport_device_id (int devnum,char *buffer,size_t len);extern void parport_daisy_deselect_all (struct parport *port);
@@ -523,7 +519,7 @@ static inline void parport_generic_irq(struct parport *port)parport_ieee1284_interrupt (port);read_lock (&port->cad_lock);if (port->cad && port->cad->irq_func) - port->cad->irq_func (port->irq, port->cad->private); + port->cad->irq_func (port->cad->private);read_unlock (&port->cad_lock); }
sound/drivers/mts64.c +1 -1
@@ -830,7 +830,7 @@ static int __devinit snd_mts64_rawmidi_create(struct snd_card *card)/********************************************************************* * parport stuff *********************************************************************/ -static void snd_mts64_interrupt (int irq,void *private) +static void snd_mts64_interrupt (void *private) {struct mts64 *mts = ((struct snd_card *)private)->private_data;u16 ret;
sound/drivers/portman2x4.c +1 -1
@@ -611,7 +611,7 @@ static int __devinit snd_portman_rawmidi_create(struct snd_card *card)/********************************************************************* * parport stuff *********************************************************************/ -static void snd_portman_interrupt (int irq,void *userdata) +static void snd_portman_interrupt (void *userdata) {unsigned char midivalue =0 ;struct portman *pm = ((struct snd_card *)userdata)->private_data;