media/*: Convert from tasklet to BH workqueue
Subsystems (5)
PATCH v3 1/1 media/*: Convert from tasklet to BH workqueue
The only generic interface to execute asynchronously in the BH context is tasklet; however, it's marked deprecated and has some design flaws. To replace tasklets, BH workqueue support was recently added. A BH workqueue behaves similarly to regular workqueues except that the queued work items are executed in the BH context.
This patch converts drivers/media/* from tasklet to BH workqueue.
Based on the work done by Tejun Heo <[email protected]>
Branch: https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-6.10
--- drivers/media/pci/bt8xx/bt878.c | 8 ++-- drivers/media/pci/bt8xx/bt878.h | 3 +- drivers/media/pci/bt8xx/dvb-bt8xx.c | 9 ++-- drivers/media/pci/ddbridge/ddbridge.h | 2 +- drivers/media/pci/mantis/hopper_cards.c | 2 +- drivers/media/pci/mantis/mantis_cards.c | 2 +- drivers/media/pci/mantis/mantis_common.h | 2 +- drivers/media/pci/mantis/mantis_dma.c | 5 ++- drivers/media/pci/mantis/mantis_dma.h | 2 +- drivers/media/pci/mantis/mantis_dvb.c | 12 +++--- drivers/media/pci/ngene/ngene-core.c | 23 ++++++----- drivers/media/pci/ngene/ngene.h | 5 ++- drivers/media/pci/smipcie/smipcie-main.c | 18 ++++---- drivers/media/pci/smipcie/smipcie.h | 3 +- drivers/media/pci/ttpci/budget-av.c | 3 +- drivers/media/pci/ttpci/budget-ci.c | 27 ++++++------ drivers/media/pci/ttpci/budget-core.c | 10 ++--- drivers/media/pci/ttpci/budget.h | 5 ++- drivers/media/pci/tw5864/tw5864-core.c | 2 +- drivers/media/pci/tw5864/tw5864-video.c | 13 +++--- drivers/media/pci/tw5864/tw5864.h | 7 ++-- drivers/media/platform/intel/pxa_camera.c | 15 +++---- drivers/media/platform/marvell/mcam-core.c | 11 ++--- drivers/media/platform/marvell/mcam-core.h | 3 +- .../st/sti/c8sectpfe/c8sectpfe-core.c | 15 +++---- .../st/sti/c8sectpfe/c8sectpfe-core.h | 2 +- drivers/media/radio/wl128x/fmdrv.h | 7 ++-- drivers/media/radio/wl128x/fmdrv_common.c | 41 ++++++++++--------- drivers/media/rc/mceusb.c | 2 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 21 +++++----- 30 files changed, 149 insertions(+), 131 deletions(-)
drivers/media/pci/bt8xx/bt878.c +4 -4
@@ -300,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) }if (astat &BT878_ARISCI ) { bt->finished_block = (stat &BT878_ARISCS ) >>28 ; -if (bt->tasklet.callback) -tasklet_schedule (&bt->tasklet); +if (bt->work.func) +queue_work (system_bh_wq, &bt->work);break ; } count++;
@@ -478,8 +478,8 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)btwrite (0 ,BT878_AINT_MASK ); bt878_num++; -if (!bt->tasklet.func) -tasklet_disable (&bt->tasklet); +if (!bt->work.func) +disable_work_sync (&bt->work);return 0 ;
drivers/media/pci/bt8xx/bt878.h +2 -1
@@ -14,6 +14,7 @@#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include "bt848.h" #include "bttv.h"
@@ -120,7 +121,7 @@ struct bt878 {dma_addr_t risc_dma;u32 risc_pos; -struct tasklet_struct tasklet; +struct work_struct work;int shutdown; };
drivers/media/pci/bt8xx/dvb-bt8xx.c +5 -4
@@ -15,6 +15,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h>
@@ -39,9 +40,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);#define IF_FREQUENCYx6 217/* 6 * 36.16666666667MHz */ -static void dvb_bt8xx_task (struct tasklet_struct *t) +static void dvb_bt8xx_task (struct work_struct *t) { -struct bt878 *bt =from_tasklet (bt, t, tasklet); +struct bt878 *bt =from_work (bt, t, work);struct dvb_bt8xx_card *card =dev_get_drvdata (&bt->adapter->dev);dprintk ("%d\n" , card->bt->finished_block);
@@ -782,7 +783,7 @@ static int dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type) goto err_disconnect_frontend; } -tasklet_setup (&card->bt->tasklet, dvb_bt8xx_task); +INIT_WORK (&card->bt->work, dvb_bt8xx_task);frontend_init (card, type);
@@ -922,7 +923,7 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub)dprintk ("dvb_bt8xx: unloading card%d\n" , card->bttv_nr);bt878_stop (card->bt); -tasklet_kill (&card->bt->tasklet); +cancel_work_sync (&card->bt->work);dvb_net_release (&card->dvbnet); card->demux.dmx.remove_frontend (&card->demux.dmx, &card->fe_mem); card->demux.dmx.remove_frontend (&card->demux.dmx, &card->fe_hw);
drivers/media/pci/ddbridge/ddbridge.h +1 -1
@@ -298,7 +298,7 @@ struct ddb_link {spinlock_t lock;/* lock link access */ struct mutex flash_mutex;/* lock flash access */ struct ddb_lnb lnb; -struct tasklet_struct tasklet; +struct work_struct work;struct ddb_ids ids;spinlock_t temp_lock;/* lock temp chip access */
drivers/media/pci/mantis/hopper_cards.c +1 -1
@@ -116,7 +116,7 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id)if (stat &MANTIS_INT_RISCI ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[8 ]); mantis->busy_block = (stat &MANTIS_INT_RISCSTAT ) >>28 ; -tasklet_schedule (&mantis->tasklet); +queue_work (system_bh_wq, &mantis->work); }if (stat &MANTIS_INT_I2CDONE ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[9 ]);
drivers/media/pci/mantis/mantis_cards.c +1 -1
@@ -125,7 +125,7 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id)if (stat &MANTIS_INT_RISCI ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[8 ]); mantis->busy_block = (stat &MANTIS_INT_RISCSTAT ) >>28 ; -tasklet_schedule (&mantis->tasklet); +queue_work (system_bh_wq, &mantis->work); }if (stat &MANTIS_INT_I2CDONE ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[9 ]);
drivers/media/pci/mantis/mantis_common.h +1 -1
@@ -125,7 +125,7 @@ struct mantis_pci {__le32 *risc_cpu;dma_addr_t risc_dma; -struct tasklet_struct tasklet; +struct work_struct work;spinlock_t intmask_lock;struct i2c_adapter adapter;
drivers/media/pci/mantis/mantis_dma.c +3 -2
@@ -15,6 +15,7 @@#include <linux/signal.h> #include <linux/sched.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h>
@@ -200,9 +201,9 @@ void mantis_dma_stop(struct mantis_pci *mantis) } -void mantis_dma_xfer (struct tasklet_struct *t) +void mantis_dma_xfer (struct work_struct *t) { -struct mantis_pci *mantis =from_tasklet (mantis, t, tasklet); +struct mantis_pci *mantis =from_work (mantis, t, work);struct mantis_hwconfig *config = mantis->hwconfig;while (mantis->last_block != mantis->busy_block) {
drivers/media/pci/mantis/mantis_dma.h +1 -1
@@ -13,6 +13,6 @@ extern int mantis_dma_init(struct mantis_pci *mantis);extern int mantis_dma_exit (struct mantis_pci *mantis);extern void mantis_dma_start (struct mantis_pci *mantis);extern void mantis_dma_stop (struct mantis_pci *mantis); -extern void mantis_dma_xfer (struct tasklet_struct *t); +extern void mantis_dma_xfer (struct work_struct *t);#endif /* __MANTIS_DMA_H */
drivers/media/pci/mantis/mantis_dvb.c +6 -6
@@ -105,7 +105,7 @@ static int mantis_dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)if (mantis->feeds ==1 ) {dprintk (MANTIS_DEBUG ,1 ,"mantis start feed & dma" );mantis_dma_start (mantis); -tasklet_enable (&mantis->tasklet); +enable_and_queue_work (system_bh_wq, &mantis->work); }return mantis->feeds;
@@ -125,7 +125,7 @@ static int mantis_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) mantis->feeds--;if (mantis->feeds ==0 ) {dprintk (MANTIS_DEBUG ,1 ,"mantis stop feed and dma" ); -tasklet_disable (&mantis->tasklet); +disable_work_sync (&mantis->work);mantis_dma_stop (mantis); }
@@ -205,8 +205,8 @@ int mantis_dvb_init(struct mantis_pci *mantis) }dvb_net_init (&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx); -tasklet_setup (&mantis->tasklet, mantis_dma_xfer); -tasklet_disable (&mantis->tasklet); +INIT_WORK (&mantis->bh, mantis_dma_xfer); +disable_work_sync (&mantis->work);if (mantis->hwconfig) { result = config->frontend_init (mantis, mantis->fe);if (result <0 ) {
@@ -235,7 +235,7 @@ int mantis_dvb_init(struct mantis_pci *mantis)/* Error conditions .. */ err5: -tasklet_kill (&mantis->tasklet); +cancel_work_sync (&mantis->work);dvb_net_release (&mantis->dvbnet);if (mantis->fe) {dvb_unregister_frontend (mantis->fe);
@@ -273,7 +273,7 @@ int mantis_dvb_exit(struct mantis_pci *mantis)dvb_frontend_detach (mantis->fe); } -tasklet_kill (&mantis->tasklet); +cancel_work_sync (&mantis->work);dvb_net_release (&mantis->dvbnet); mantis->demux.dmx.remove_frontend (&mantis->demux.dmx, &mantis->fe_mem);
drivers/media/pci/ngene/ngene-core.c +12 -11
@@ -21,6 +21,7 @@#include <linux/byteorder/generic.h> #include <linux/firmware.h> #include <linux/vmalloc.h> +#include <linux/workqueue.h> #include "ngene.h"
@@ -50,9 +51,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);/* nGene interrupt handler **************************************************/ /****************************************************************************/ -static void event_tasklet (struct tasklet_struct *t) +static void event_work (struct work_struct *t) { -struct ngene *dev =from_tasklet (dev, t, event_tasklet); +struct ngene *dev =from_work (dev, t, event_work);while (dev->EventQueueReadIndex != dev->EventQueueWriteIndex) { struct EVENT_BUFFER Event =
@@ -68,9 +69,9 @@ static void event_tasklet(struct tasklet_struct *t) } } -static void demux_tasklet (struct tasklet_struct *t) +static void demux_work (struct work_struct *t) { -struct ngene_channel *chan =from_tasklet (chan, t, demux_tasklet); +struct ngene_channel *chan =from_work (chan, t, demux_work);struct device *pdev = &chan->dev->pci_dev->dev;struct SBufferHeader *Cur = chan->nextBuffer;
@@ -204,7 +205,7 @@ static irqreturn_t irq_handler(int irq, void *dev_id) dev->EventQueueOverflowFlag =1 ; } dev->EventBuffer->EventStatus &= ~0x80 ; -tasklet_schedule (&dev->event_tasklet); +queue_work (system_bh_wq, &dev->event_work); rc =IRQ_HANDLED ; }
@@ -217,8 +218,8 @@ static irqreturn_t irq_handler(int irq, void *dev_id) ngeneBuffer.SR.Flags & 0xC0) == 0x80) { dev->channel[i].nextBuffer-> ngeneBuffer.SR.Flags |=0x40 ; -tasklet_schedule ( - &dev->channel[i].demux_tasklet); +queue_work (system_bh_wq, + &dev->channel[i].demux_work); rc =IRQ_HANDLED ; } }
@@ -1181,7 +1182,7 @@ static void ngene_init(struct ngene *dev)struct device *pdev = &dev->pci_dev->dev;int i; -tasklet_setup (&dev->event_tasklet, event_tasklet); +INIT_WORK (&dev->event_work, event_work);memset_io (dev->iomem +0xc000 ,0x00 ,0x220 );memset_io (dev->iomem +0xc400 ,0x00 ,0x100 );
@@ -1395,7 +1396,7 @@ static void release_channel(struct ngene_channel *chan)if (chan->running)set_transfer (chan,0 ); -tasklet_kill (&chan->demux_tasklet); +cancel_work_sync (&chan->demux_work);if (chan->ci_dev) {dvb_unregister_device (chan->ci_dev);
@@ -1445,7 +1446,7 @@ static int init_channel(struct ngene_channel *chan)struct ngene_info *ni = dev->card_info;int io = ni->io_type[nr]; -tasklet_setup (&chan->demux_tasklet, demux_tasklet); +INIT_WORK (&chan->demux_work, demux_work); chan->users =0 ; chan->type = io; chan->mode = chan->type;/* for now only one mode */
@@ -1647,7 +1648,7 @@ void ngene_remove(struct pci_dev *pdev)struct ngene *dev =pci_get_drvdata (pdev);int i; -tasklet_kill (&dev->event_tasklet); +cancel_work_sync (&dev->event_work);for (i =MAX_STREAM -1 ; i >=0 ; i--)release_channel (&dev->channel[i]);if (dev->ci.en)
drivers/media/pci/ngene/ngene.h +3 -2
@@ -16,6 +16,7 @@#include <linux/scatterlist.h> #include <linux/dvb/frontend.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h>
@@ -621,7 +622,7 @@ struct ngene_channel {int users;struct video_device *v4l_dev;struct dvb_device *ci_dev; -struct tasklet_struct demux_tasklet; +struct work_struct demux_work;struct SBufferHeader *nextBuffer;enum KSSTATE State;
@@ -717,7 +718,7 @@ struct ngene {struct EVENT_BUFFER EventQueue[EVENT_QUEUE_SIZE ];int EventQueueOverflowCount;int EventQueueOverflowFlag; -struct tasklet_struct event_tasklet; +struct work_struct event_work;struct EVENT_BUFFER *EventBuffer;int EventQueueWriteIndex;int EventQueueReadIndex;
drivers/media/pci/smipcie/smipcie-main.c +9 -9
@@ -279,10 +279,10 @@ static void smi_port_clearInterrupt(struct smi_port *port) (port->_dmaInterruptCH0 | port->_dmaInterruptCH1)); } -/* tasklet handler: DMA data to dmx.*/ -static void smi_dma_xfer (struct tasklet_struct *t) +/* work handler: DMA data to dmx.*/ +static void smi_dma_xfer (struct work_struct *t) { -struct smi_port *port =from_tasklet (port, t, tasklet); +struct smi_port *port =from_work (port, t, work);struct smi_dev *dev = port->dev;u32 intr_status, finishedData, dmaManagement;u8 dmaChan0State, dmaChan1State;
@@ -426,8 +426,8 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed) }smi_port_disableInterrupt (port); -tasklet_setup (&port->tasklet, smi_dma_xfer); -tasklet_disable (&port->tasklet); +INIT_WORK (&port->work, smi_dma_xfer); +disable_work_sync (&port->work); port->enable =1 ;return 0 ; err:
@@ -438,7 +438,7 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed)static void smi_port_exit (struct smi_port *port) {smi_port_disableInterrupt (port); -tasklet_kill (&port->tasklet); +cancel_work_sync (&port->work);smi_port_dma_free (port); port->enable =0 ; }
@@ -452,7 +452,7 @@ static int smi_port_irq(struct smi_port *port, u32 int_status)smi_port_disableInterrupt (port); port->_int_status = int_status;smi_port_clearInterrupt (port); -tasklet_schedule (&port->tasklet); +queue_work (system_bh_wq, &port->work); handled =1 ; }return handled;
@@ -823,7 +823,7 @@ static int smi_start_feed(struct dvb_demux_feed *dvbdmxfeed)smi_port_clearInterrupt (port);smi_port_enableInterrupt (port);smi_write (port->DMA_MANAGEMENT, dmaManagement); -tasklet_enable (&port->tasklet); +enable_and_queue_work (system_bh_wq, &port->work); }return port->users; }
@@ -837,7 +837,7 @@ static int smi_stop_feed(struct dvb_demux_feed *dvbdmxfeed)if (--port->users)return port->users; -tasklet_disable (&port->tasklet); +disable_work_sync (&port->work);smi_port_disableInterrupt (port);smi_clear (port->DMA_MANAGEMENT,0x30003 );return 0 ;
drivers/media/pci/smipcie/smipcie.h +2 -1
@@ -17,6 +17,7 @@#include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/slab.h> +#include <linux/workqueue.h> #include <media/rc-core.h> #include <media/demux.h>
@@ -257,7 +258,7 @@ struct smi_port {u32 _dmaInterruptCH0;u32 _dmaInterruptCH1;u32 _int_status; -struct tasklet_struct tasklet; +struct work_struct work;/* dvb */ struct dmx_frontend hw_frontend;struct dmx_frontend mem_frontend;
drivers/media/pci/ttpci/budget-av.c +2 -1
@@ -37,6 +37,7 @@#include <linux/interrupt.h> #include <linux/input.h> #include <linux/spinlock.h> +#include <linux/workqueue.h> #include <media/dvb_ca_en50221.h>
@@ -55,7 +56,7 @@ struct budget_av {struct video_device vd;int cur_input;int has_saa7113; -struct tasklet_struct ciintf_irq_tasklet; +struct work_struct ciintf_irq_work;int slot_status;struct dvb_ca_en50221 ca; u8 reinitialise_demod:1;
drivers/media/pci/ttpci/budget-ci.c +14 -13
@@ -17,6 +17,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/spinlock.h> +#include <linux/workqueue.h> #include <media/rc-core.h> #include "budget.h"
@@ -80,7 +81,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);struct budget_ci_ir {struct rc_dev *dev; -struct tasklet_struct msp430_irq_tasklet; +struct work_struct msp430_irq_work;char name[72 ];/* 40 + 32 for (struct saa7146_dev).name */ char phys[32 ];int rc5_device;
@@ -91,7 +92,7 @@ struct budget_ci_ir {struct budget_ci {struct budget budget; -struct tasklet_struct ciintf_irq_tasklet; +struct work_struct ciintf_irq_work;int slot_status;int ci_irq;struct dvb_ca_en50221 ca;
@@ -99,9 +100,9 @@ struct budget_ci {u8 tuner_pll_address;/* used for philips_tdm1316l configs */ }; -static void msp430_ir_interrupt (struct tasklet_struct *t) +static void msp430_ir_interrupt (struct work_struct *t) { -struct budget_ci_ir *ir =from_tasklet (ir, t, msp430_irq_tasklet); +struct budget_ci_ir *ir =from_work (ir, t, msp430_irq_work);struct budget_ci *budget_ci =container_of (ir,typeof (*budget_ci), ir);struct rc_dev *dev = budget_ci->ir.dev;u32 command =ttpci_budget_debiread (&budget_ci->budget,DEBINOSWAP ,DEBIADDR_IR ,2 ,1 ,0 ) >>8 ;
@@ -230,7 +231,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) budget_ci->ir.dev = dev; -tasklet_setup (&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt); +INIT_WORK (&budget_ci->ir.msp430_irq_work, msp430_ir_interrupt);SAA7146_IER_ENABLE (saa,MASK_06 );saa7146_setgpio (saa,3 ,SAA7146_GPIO_IRQHI );
@@ -244,7 +245,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)SAA7146_IER_DISABLE (saa,MASK_06 );saa7146_setgpio (saa,3 ,SAA7146_GPIO_INPUT ); -tasklet_kill (&budget_ci->ir.msp430_irq_tasklet); +cancel_work_sync (&budget_ci->ir.msp430_irq_work);rc_unregister_device (budget_ci->ir.dev); }
@@ -348,10 +349,10 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)return 0 ; } -static void ciintf_interrupt (struct tasklet_struct *t) +static void ciintf_interrupt (struct work_struct *t) { -struct budget_ci *budget_ci =from_tasklet (budget_ci, t, - ciintf_irq_tasklet); +struct budget_ci *budget_ci =from_work (budget_ci, t, + ciintf_irq_work);struct saa7146_dev *saa = budget_ci->budget.dev;unsigned int flags;
@@ -492,7 +493,7 @@ static int ciintf_init(struct budget_ci *budget_ci)// Setup CI slot IRQ if (budget_ci->ci_irq) { -tasklet_setup (&budget_ci->ciintf_irq_tasklet, ciintf_interrupt); +INIT_WORK (&budget_ci->ciintf_irq_work, ciintf_interrupt);if (budget_ci->slot_status !=SLOTSTATUS_NONE ) {saa7146_setgpio (saa,0 ,SAA7146_GPIO_IRQLO ); }else {
@@ -532,7 +533,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)if (budget_ci->ci_irq) {SAA7146_IER_DISABLE (saa,MASK_03 );saa7146_setgpio (saa,0 ,SAA7146_GPIO_INPUT ); -tasklet_kill (&budget_ci->ciintf_irq_tasklet); +cancel_work_sync (&budget_ci->ciintf_irq_work); }// reset interface
@@ -558,13 +559,13 @@ static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)dprintk (8 ,"dev: %p, budget_ci: %p\n" , dev, budget_ci);if (*isr &MASK_06 ) -tasklet_schedule (&budget_ci->ir.msp430_irq_tasklet); +queue_work (system_bh_wq, &budget_ci->ir.msp430_irq_work);if (*isr &MASK_10 )ttpci_budget_irq10_handler (dev, isr);if ((*isr &MASK_03 ) && (budget_ci->budget.ci_present) && (budget_ci->ci_irq)) -tasklet_schedule (&budget_ci->ciintf_irq_tasklet); +queue_work (system_bh_wq, &budget_ci->ciintf_irq_work); }static u8 philips_su1278_tt_inittab[] = {
drivers/media/pci/ttpci/budget-core.c +5 -5
@@ -171,9 +171,9 @@ static int budget_read_fe_status(struct dvb_frontend *fe,return ret; } -static void vpeirq (struct tasklet_struct *t) +static void vpeirq (struct work_struct *t) { -struct budget *budget =from_tasklet (budget, t, vpe_tasklet); +struct budget *budget =from_work (budget, t, vpe_work);u8 *mem = (u8 *) (budget->grabbing);u32 olddma = budget->ttbp;u32 newdma =saa7146_read (budget->dev,PCI_VDP3 );
@@ -520,7 +520,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,/* upload all */ saa7146_write (dev,GPIO_CTRL ,0x000000 ); -tasklet_setup (&budget->vpe_tasklet, vpeirq); +INIT_WORK (&budget->vpe_work, vpeirq);/* frontend power on */ if (bi->type !=BUDGET_FS_ACTIVY )
@@ -557,7 +557,7 @@ int ttpci_budget_deinit(struct budget *budget)budget_unregister (budget); -tasklet_kill (&budget->vpe_tasklet); +cancel_work_sync (&budget->vpe_work);saa7146_vfree_destroy_pgtable (dev->pci, budget->grabbing, &budget->pt);
@@ -575,7 +575,7 @@ void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr)dprintk (8 ,"dev: %p, budget: %p\n" , dev, budget);if (*isr &MASK_10 ) -tasklet_schedule (&budget->vpe_tasklet); +queue_work (system_bh_wq, &budget->vpe_work); }void ttpci_budget_set_video_port (struct saa7146_dev *dev,int video_port)
drivers/media/pci/ttpci/budget.h +3 -2
@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <media/drv-intf/saa7146.h>
@@ -49,8 +50,8 @@ struct budget {unsigned char *grabbing;struct saa7146_pgtable pt; -struct tasklet_struct fidb_tasklet; -struct tasklet_struct vpe_tasklet; +struct work_struct fidb_work; +struct work_struct vpe_work;struct dmxdev dmxdev;struct dvb_demux demux;
drivers/media/pci/tw5864/tw5864-core.c +1 -1
@@ -144,7 +144,7 @@ static void tw5864_h264_isr(struct tw5864_dev *dev) cur_frame->gop_seqno = input->frame_gop_seqno; dev->h264_buf_w_index = next_frame_index; -tasklet_schedule (&dev->tasklet); +queue_work (system_bh_wq, &dev->work); cur_frame = next_frame;
drivers/media/pci/tw5864/tw5864-video.c +7 -6
@@ -6,6 +6,7 @@*/ #include <linux/module.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-event.h> #include <media/videobuf2-dma-contig.h>
@@ -175,7 +176,7 @@ static const unsigned int intra4x4_lambda3[] = {static v4l2_std_id tw5864_get_v4l2_std (enum tw5864_vid_std std);static enum tw5864_vid_std tw5864_from_v4l2_std (v4l2_std_id v4l2_std); -static void tw5864_handle_frame_task (struct tasklet_struct *t); +static void tw5864_handle_frame_task (struct work_struct *t);static void tw5864_handle_frame (struct tw5864_h264_frame *frame);static void tw5864_frame_interval_set (struct tw5864_input *input);
@@ -1062,7 +1063,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr) dev->irqmask |=TW5864_INTR_VLC_DONE |TW5864_INTR_TIMER ;tw5864_irqmask_apply (dev); -tasklet_setup (&dev->tasklet, tw5864_handle_frame_task); +INIT_WORK (&dev->work, tw5864_handle_frame_task);for (i =0 ; i <TW5864_INPUTS ; i++) { dev->inputs[i].root = dev;
@@ -1079,7 +1080,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr)for (i = last_input_nr_registered; i >=0 ; i--)tw5864_video_input_fini (&dev->inputs[i]); -tasklet_kill (&dev->tasklet); +cancel_work_sync (&dev->work); free_dma:for (i = last_dma_allocated; i >=0 ; i--) {
@@ -1198,7 +1199,7 @@ void tw5864_video_fini(struct tw5864_dev *dev) {int i; -tasklet_kill (&dev->tasklet); +cancel_work_sync (&dev->work);for (i =0 ; i <TW5864_INPUTS ; i++)tw5864_video_input_fini (&dev->inputs[i]);
@@ -1315,9 +1316,9 @@ static int tw5864_is_motion_triggered(struct tw5864_h264_frame *frame)return detected; } -static void tw5864_handle_frame_task (struct tasklet_struct *t) +static void tw5864_handle_frame_task (struct work_struct *t) { -struct tw5864_dev *dev =from_tasklet (dev, t, tasklet); +struct tw5864_dev *dev =from_work (dev, t, work);unsigned long flags;int batch_size =H264_BUF_CNT ;
drivers/media/pci/tw5864/tw5864.h +4 -3
@@ -12,6 +12,7 @@#include <linux/mutex.h> #include <linux/io.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h>
@@ -85,7 +86,7 @@ struct tw5864_input {int nr;/* input number */ struct tw5864_dev *root;struct mutex lock;/* used for vidq and vdev */ -spinlock_t slock;/* used for sync between ISR, tasklet & V4L2 API */ +spinlock_t slock;/* used for sync between ISR, work & V4L2 API */ struct video_device vdev;struct v4l2_ctrl_handler hdl;struct vb2_queue vidq;
@@ -142,7 +143,7 @@ struct tw5864_h264_frame {/* global device status */ struct tw5864_dev { -spinlock_t slock;/* used for sync between ISR, tasklet & V4L2 API */ +spinlock_t slock;/* used for sync between ISR, work & V4L2 API */ struct v4l2_device v4l2_dev;struct tw5864_input inputs[TW5864_INPUTS ];#define H264_BUF_CNT 4
@@ -150,7 +151,7 @@ struct tw5864_dev {int h264_buf_r_index;int h264_buf_w_index; -struct tasklet_struct tasklet; +struct work_struct work;int encoder_busy;/* Input number to check next for ready raw picture (in RR fashion) */
drivers/media/platform/intel/pxa_camera.c +8 -7
@@ -43,6 +43,7 @@#include <linux/videodev2.h> #include <linux/platform_data/media/camera-pxa.h> +#include <linux/workqueue.h> #define PXA_CAM_VERSION "0.0.6"#define PXA_CAM_DRV_NAME "pxa27x-camera"
@@ -683,7 +684,7 @@ struct pxa_camera_dev {unsigned int buf_sequence;struct pxa_buffer *active; -struct tasklet_struct task_eof; +struct work_struct task_eof;u32 save_cicr[5 ]; };
@@ -1146,9 +1147,9 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)clk_disable_unprepare (pcdev->clk); } -static void pxa_camera_eof (struct tasklet_struct *t) +static void pxa_camera_eof (struct work_struct *t) { -struct pxa_camera_dev *pcdev =from_tasklet (pcdev, t, task_eof); +struct pxa_camera_dev *pcdev =from_work (pcdev, t, task_eof);unsigned long cifr;struct pxa_buffer *buf;
@@ -1185,7 +1186,7 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)if (status &CISR_EOF ) { cicr0 =__raw_readl (pcdev->base +CICR0 ) |CICR0_EOFM ;__raw_writel (cicr0, pcdev->base +CICR0 ); -tasklet_schedule (&pcdev->task_eof); +queue_work (system_bh_wq, &pcdev->task_eof); }return IRQ_HANDLED ;
@@ -2383,7 +2384,7 @@ static int pxa_camera_probe(struct platform_device *pdev) } } -tasklet_setup (&pcdev->task_eof, pxa_camera_eof); +INIT_WORK (&pcdev->task_eof, pxa_camera_eof);pxa_camera_activate (pcdev);
@@ -2409,7 +2410,7 @@ static int pxa_camera_probe(struct platform_device *pdev)return 0 ; exit_deactivate:pxa_camera_deactivate (pcdev); -tasklet_kill (&pcdev->task_eof); +cancel_work_sync (&pcdev->task_eof); exit_free_dma:dma_release_channel (pcdev->dma_chans[2 ]); exit_free_dma_u:
@@ -2428,7 +2429,7 @@ static void pxa_camera_remove(struct platform_device *pdev)struct pxa_camera_dev *pcdev =platform_get_drvdata (pdev);pxa_camera_deactivate (pcdev); -tasklet_kill (&pcdev->task_eof); +cancel_work_sync (&pcdev->task_eof);dma_release_channel (pcdev->dma_chans[0 ]);dma_release_channel (pcdev->dma_chans[1 ]);dma_release_channel (pcdev->dma_chans[2 ]);
drivers/media/platform/marvell/mcam-core.c +6 -5
@@ -25,6 +25,7 @@#include <linux/clk-provider.h> #include <linux/videodev2.h> #include <linux/pm_runtime.h> +#include <linux/workqueue.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h>
@@ -439,9 +440,9 @@ static void mcam_ctlr_dma_vmalloc(struct mcam_camera *cam)/* * Copy data out to user space in the vmalloc case */ -static void mcam_frame_tasklet (struct tasklet_struct *t) +static void mcam_frame_work (struct work_struct *t) { -struct mcam_camera *cam =from_tasklet (cam, t, s_tasklet); +struct mcam_camera *cam =from_work (cam, t, s_work);int i;unsigned long flags;struct mcam_vb_buffer *buf;
@@ -480,7 +481,7 @@ static void mcam_frame_tasklet(struct tasklet_struct *t)/* -* Make sure our allocated buffers are up to the task. +* Make sure our allocated buffers are up to the work. */ static int mcam_check_dma_buffers (struct mcam_camera *cam) {
@@ -493,7 +494,7 @@ static int mcam_check_dma_buffers(struct mcam_camera *cam)static void mcam_vmalloc_done (struct mcam_camera *cam,int frame) { -tasklet_schedule (&cam->s_tasklet); +queue_work (system_bh_wq, &cam->s_work); }#else /* MCAM_MODE_VMALLOC */
@@ -1305,7 +1306,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam)break ;case B_vmalloc:#ifdef MCAM_MODE_VMALLOC -tasklet_setup (&cam->s_tasklet, mcam_frame_tasklet); +INIT_WORK (&cam->s_work, mcam_frame_work); vq->ops = &mcam_vb2_ops; vq->mem_ops = &vb2_vmalloc_memops; cam->dma_setup = mcam_ctlr_dma_vmalloc;
drivers/media/platform/marvell/mcam-core.h +2 -1
@@ -9,6 +9,7 @@#include <linux/list.h> #include <linux/clk-provider.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-dev.h>
@@ -167,7 +168,7 @@ struct mcam_camera {unsigned int dma_buf_size;/* allocated size */ void *dma_bufs[MAX_DMA_BUFS ];/* Internal buffer addresses */ dma_addr_t dma_handles[MAX_DMA_BUFS ];/* Buffer bus addresses */ -struct tasklet_struct s_tasklet; +struct work_struct s_work;#endif unsigned int sequence;/* Frame sequence number */ unsigned int buf_seq[MAX_DMA_BUFS ];/* Sequence for individual bufs */
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +8 -7
@@ -33,6 +33,7 @@#include <linux/time.h> #include <linux/usb.h> #include <linux/wait.h> +#include <linux/workqueue.h> #include "c8sectpfe-common.h" #include "c8sectpfe-core.h"
@@ -73,16 +74,16 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t)/* is this descriptor initialised and TP enabled */ if (channel->irec &&readl (channel->irec +DMA_PRDS_TPENABLE )) -tasklet_schedule (&channel->tsklet); +queue_work (system_bh_wq, &channel->work); } fei->timer.expires = jiffies +msecs_to_jiffies (POLL_MSECS );add_timer (&fei->timer); } -static void channel_swdemux_tsklet (struct tasklet_struct *t) +static void channel_swdemux_work (struct work_struct *t) { -struct channel_info *channel =from_tasklet (channel, t, tsklet); +struct channel_info *channel =from_work (channel, t, work);struct c8sectpfei *fei;unsigned long wp, rp;int pos, num_packets, n, size;
@@ -211,7 +212,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed)dev_dbg (fei->dev,"Starting channel=%p\n" , channel); -tasklet_setup (&channel->tsklet, channel_swdemux_tsklet); +INIT_WORK (&channel->work, channel_swdemux_work);/* Reset the internal inputblock sram pointers */ writel(channel->fifo,
@@ -304,7 +305,7 @@ static int c8sectpfe_stop_feed(struct dvb_demux_feed *dvbdmxfeed)/* disable this channels descriptor */ writel (0 , channel->irec +DMA_PRDS_TPENABLE ); -tasklet_disable (&channel->tsklet); +disable_work_sync (&channel->work);/* now request memdma channel goes idle */ idlereq = (1 << channel->tsin_id) |IDLEREQ ;
@@ -631,8 +632,8 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei,writel (tsin->back_buffer_busaddr, tsin->irec +DMA_PRDS_BUSWP_TP (0 ));writel (tsin->back_buffer_busaddr, tsin->irec +DMA_PRDS_BUSRP_TP (0 )); -/* initialize tasklet */ -tasklet_setup (&tsin->tsklet, channel_swdemux_tsklet); +/* initialize work */ +INIT_WORK (&tsin->work, channel_swdemux_work);return 0 ;
drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.h +1 -1
@@ -51,7 +51,7 @@ struct channel_info {unsigned long fifo;struct completion idle_completion; -struct tasklet_struct tsklet; +struct work_struct work;struct c8sectpfei *fei;void __iomem *irec;
drivers/media/radio/wl128x/fmdrv.h +4 -3
@@ -15,6 +15,7 @@#include <sound/core.h> #include <sound/initval.h> #include <linux/timer.h> +#include <linux/workqueue.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h>
@@ -200,15 +201,15 @@ struct fmdev {int streg_cbdata;/* status of ST registration */ struct sk_buff_head rx_q;/* RX queue */ -struct tasklet_struct rx_task;/* RX Tasklet */ +struct work_struct rx_task;/* RX Work */ struct sk_buff_head tx_q;/* TX queue */ -struct tasklet_struct tx_task;/* TX Tasklet */ +struct work_struct tx_task;/* TX Work */ unsigned long last_tx_jiffies;/* Timestamp of last pkt sent */ atomic_t tx_cnt;/* Number of packets can send at a time */ struct sk_buff *resp_skb;/* Response from the chip */ -/* Main task completion handler */ +/* Main work completion handler */ struct completion maintask_comp;/* Opcode of last command sent to the chip */ u8 pre_op;
drivers/media/radio/wl128x/fmdrv_common.c +21 -20
129 lines not on this page · raw message
drivers/media/rc/mceusb.c +1 -1
@@ -774,7 +774,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, u8 *buf, int buf_len,/* * Schedule work that can't be done in interrupt handlers -* (mceusb_dev_recv() and mce_write_callback()) nor tasklets. +* (mceusb_dev_recv() and mce_write_callback()) nor works. * Invokes mceusb_deferred_kevent() for recovering from * error events specified by the kevent bit field. */
drivers/media/usb/ttusb-dec/ttusb_dec.c +11 -10
@@ -19,6 +19,7 @@#include <linux/input.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvb_demux.h>
@@ -139,7 +140,7 @@ struct ttusb_dec {int v_pes_postbytes;struct list_head urb_frame_list; -struct tasklet_struct urb_tasklet; +struct work_struct urb_work;spinlock_t urb_frame_list_lock;struct dvb_demux_filter *audio_filter;
@@ -766,9 +767,9 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, } } -static void ttusb_dec_process_urb_frame_list (struct tasklet_struct *t) +static void ttusb_dec_process_urb_frame_list (struct work_struct *t) { -struct ttusb_dec *dec =from_tasklet (dec, t, urb_tasklet); +struct ttusb_dec *dec =from_work (dec, t, urb_work);struct list_head *item;struct urb_frame *frame;unsigned long flags;
@@ -822,7 +823,7 @@ static void ttusb_dec_process_urb(struct urb *urb)spin_unlock_irqrestore (&dec->urb_frame_list_lock, flags); -tasklet_schedule (&dec->urb_tasklet); +queue_work (system_bh_wq, &dec->urb_work); } } }else {
@@ -1198,11 +1199,11 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)return 0 ; } -static void ttusb_dec_init_tasklet (struct ttusb_dec *dec) +static void ttusb_dec_init_work (struct ttusb_dec *dec) {spin_lock_init (&dec->urb_frame_list_lock);INIT_LIST_HEAD (&dec->urb_frame_list); -tasklet_setup (&dec->urb_tasklet, ttusb_dec_process_urb_frame_list); +INIT_WORK (&dec->urb_work, ttusb_dec_process_urb_frame_list); }static int ttusb_init_rc (struct ttusb_dec *dec)
@@ -1588,12 +1589,12 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec)ttusb_dec_free_iso_urbs (dec); } -static void ttusb_dec_exit_tasklet (struct ttusb_dec *dec) +static void ttusb_dec_exit_work (struct ttusb_dec *dec) {struct list_head *item;struct urb_frame *frame; -tasklet_kill (&dec->urb_tasklet); +cancel_work_sync (&dec->urb_work);while ((item = dec->urb_frame_list.next) != &dec->urb_frame_list) { frame = list_entry(item, struct urb_frame, urb_frame_list);
@@ -1703,7 +1704,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,ttusb_dec_init_v_pes (dec);ttusb_dec_init_filters (dec); -ttusb_dec_init_tasklet (dec); +ttusb_dec_init_work (dec); dec->active =1 ;
@@ -1729,7 +1730,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf)dprintk ("%s\n" , __func__);if (dec->active) { -ttusb_dec_exit_tasklet (dec); +ttusb_dec_exit_work (dec);ttusb_dec_exit_filters (dec);if (enable_rc)ttusb_dec_exit_rc (dec);
Signature · 1 line
2.17.1
Hi Allen,
Some review comments:
Regarding the Subject: instead of 'media/*:' just write 'media:'.
Quoted 50 lines · Allen Pais
The only generic interface to execute asynchronously in the BH context is tasklet; however, it's marked deprecated and has some design flaws. To replace tasklets, BH workqueue support was recently added. A BH workqueue behaves similarly to regular workqueues except that the queued work items are executed in the BH context.
This patch converts
drivers/media/*from tasklet to BH workqueue.Based on the work done by Tejun Heo <[email protected]>
Branch: https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-6.10Signed-off-by Allen Pais <[email protected]>--- drivers/media/pci/bt8xx/bt878.c | 8 ++-- drivers/media/pci/bt8xx/bt878.h | 3 +- drivers/media/pci/bt8xx/dvb-bt8xx.c | 9 ++-- drivers/media/pci/ddbridge/ddbridge.h | 2 +- drivers/media/pci/mantis/hopper_cards.c | 2 +- drivers/media/pci/mantis/mantis_cards.c | 2 +- drivers/media/pci/mantis/mantis_common.h | 2 +- drivers/media/pci/mantis/mantis_dma.c | 5 ++- drivers/media/pci/mantis/mantis_dma.h | 2 +- drivers/media/pci/mantis/mantis_dvb.c | 12 +++--- drivers/media/pci/ngene/ngene-core.c | 23 ++++++----- drivers/media/pci/ngene/ngene.h | 5 ++- drivers/media/pci/smipcie/smipcie-main.c | 18 ++++---- drivers/media/pci/smipcie/smipcie.h | 3 +- drivers/media/pci/ttpci/budget-av.c | 3 +- drivers/media/pci/ttpci/budget-ci.c | 27 ++++++------ drivers/media/pci/ttpci/budget-core.c | 10 ++--- drivers/media/pci/ttpci/budget.h | 5 ++- drivers/media/pci/tw5864/tw5864-core.c | 2 +- drivers/media/pci/tw5864/tw5864-video.c | 13 +++--- drivers/media/pci/tw5864/tw5864.h | 7 ++-- drivers/media/platform/intel/pxa_camera.c | 15 +++---- drivers/media/platform/marvell/mcam-core.c | 11 ++--- drivers/media/platform/marvell/mcam-core.h | 3 +- .../st/sti/c8sectpfe/c8sectpfe-core.c | 15 +++---- .../st/sti/c8sectpfe/c8sectpfe-core.h | 2 +- drivers/media/radio/wl128x/fmdrv.h | 7 ++-- drivers/media/radio/wl128x/fmdrv_common.c | 41 ++++++++++--------- drivers/media/rc/mceusb.c | 2 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 21 +++++----- 30 files changed, 149 insertions(+), 131 deletions(-)drivers/media/pci/bt8xx/bt878.c +0
-0
drivers/media/pci/bt8xx/bt878.c static irqreturn_t bt878_irq(int irq, void *dev_id) · line 304
Quoted 7 lines
drivers/media/pci/bt8xx/bt878.c +2
-2@@ -300,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) }if (astat &BT878_ARISCI ) { bt->finished_block = (stat &BT878_ARISCS ) >>28 ; -if (bt->tasklet.callback) -tasklet_schedule (&bt->tasklet); +if (bt->work.func) +queue_work (system_bh_wq, &bt->work);
I would prefer that 'work' is renamed to 'bh_work'. That way it is easy to identify it as part of system_bh_wq. This is true for the other drivers in this patch as well, so I won't repeat this.
Quoted 48 lines
drivers/media/pci/bt8xx/bt878.c +2
-2break ; } count++;@@ -478,8 +478,8 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)btwrite (0 ,BT878_AINT_MASK ); bt878_num++; -if (!bt->tasklet.func) -tasklet_disable (&bt->tasklet); +if (!bt->work.func) +disable_work_sync (&bt->work);return 0 ;drivers/media/pci/bt8xx/bt878.h +2
-1@@ -14,6 +14,7 @@#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include "bt848.h" #include "bttv.h" @@ -120,7 +121,7 @@ struct bt878 {dma_addr_t risc_dma;u32 risc_pos; -struct tasklet_struct tasklet; +struct work_struct work;int shutdown; };drivers/media/pci/bt8xx/dvb-bt8xx.c +1
-0@@ -15,6 +15,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h>
drivers/media/pci/bt8xx/dvb-bt8xx.c DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); · line 43
Quoted 5 lines
drivers/media/pci/bt8xx/dvb-bt8xx.c +1
-1@@ -39,9 +40,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);#define IF_FREQUENCYx6 217/* 6 * 36.16666666667MHz */ -static void dvb_bt8xx_task (struct tasklet_struct *t) +static void dvb_bt8xx_task (struct work_struct *t)
I'd rename _task to _work.
Quoted 29 lines
drivers/media/pci/bt8xx/dvb-bt8xx.c +3
-3{ -struct bt878 *bt =from_tasklet (bt, t, tasklet); +struct bt878 *bt =from_work (bt, t, work);struct dvb_bt8xx_card *card =dev_get_drvdata (&bt->adapter->dev);dprintk ("%d\n" , card->bt->finished_block);@@ -782,7 +783,7 @@ static int dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type) goto err_disconnect_frontend; } -tasklet_setup (&card->bt->tasklet, dvb_bt8xx_task); +INIT_WORK (&card->bt->work, dvb_bt8xx_task);frontend_init (card, type);@@ -922,7 +923,7 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub)dprintk ("dvb_bt8xx: unloading card%d\n" , card->bttv_nr);bt878_stop (card->bt); -tasklet_kill (&card->bt->tasklet); +cancel_work_sync (&card->bt->work);dvb_net_release (&card->dvbnet); card->demux.dmx.remove_frontend (&card->demux.dmx, &card->fe_mem); card->demux.dmx.remove_frontend (&card->demux.dmx, &card->fe_hw);drivers/media/pci/ddbridge/ddbridge.h +0
-0
drivers/media/pci/ddbridge/ddbridge.h struct ddb_link { · line 301
Quoted 5 lines
drivers/media/pci/ddbridge/ddbridge.h +1
-1@@ -298,7 +298,7 @@ struct ddb_link {spinlock_t lock;/* lock link access */ struct mutex flash_mutex;/* lock flash access */ struct ddb_lnb lnb; -struct tasklet_struct tasklet; +struct work_struct work;
Please keep the alignment so 'work' aligns with the other fields.
Quoted 101 lines
drivers/media/pci/ddbridge/ddbridge.h +0
-0struct ddb_ids ids;spinlock_t temp_lock;/* lock temp chip access */ drivers/media/pci/mantis/hopper_cards.c +1
-1@@ -116,7 +116,7 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id)if (stat &MANTIS_INT_RISCI ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[8 ]); mantis->busy_block = (stat &MANTIS_INT_RISCSTAT ) >>28 ; -tasklet_schedule (&mantis->tasklet); +queue_work (system_bh_wq, &mantis->work); }if (stat &MANTIS_INT_I2CDONE ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[9 ]);drivers/media/pci/mantis/mantis_cards.c +1
-1@@ -125,7 +125,7 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id)if (stat &MANTIS_INT_RISCI ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[8 ]); mantis->busy_block = (stat &MANTIS_INT_RISCSTAT ) >>28 ; -tasklet_schedule (&mantis->tasklet); +queue_work (system_bh_wq, &mantis->work); }if (stat &MANTIS_INT_I2CDONE ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[9 ]);drivers/media/pci/mantis/mantis_common.h +1
-1@@ -125,7 +125,7 @@ struct mantis_pci {__le32 *risc_cpu;dma_addr_t risc_dma; -struct tasklet_struct tasklet; +struct work_struct work;spinlock_t intmask_lock;struct i2c_adapter adapter;drivers/media/pci/mantis/mantis_dma.c +3
-2@@ -15,6 +15,7 @@#include <linux/signal.h> #include <linux/sched.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h> @@ -200,9 +201,9 @@ void mantis_dma_stop(struct mantis_pci *mantis) } -void mantis_dma_xfer (struct tasklet_struct *t) +void mantis_dma_xfer (struct work_struct *t) { -struct mantis_pci *mantis =from_tasklet (mantis, t, tasklet); +struct mantis_pci *mantis =from_work (mantis, t, work);struct mantis_hwconfig *config = mantis->hwconfig;while (mantis->last_block != mantis->busy_block) {drivers/media/pci/mantis/mantis_dma.h +1
-1@@ -13,6 +13,6 @@ extern int mantis_dma_init(struct mantis_pci *mantis);extern int mantis_dma_exit (struct mantis_pci *mantis);extern void mantis_dma_start (struct mantis_pci *mantis);extern void mantis_dma_stop (struct mantis_pci *mantis); -extern void mantis_dma_xfer (struct tasklet_struct *t); +extern void mantis_dma_xfer (struct work_struct *t);#endif /* __MANTIS_DMA_H */ drivers/media/pci/mantis/mantis_dvb.c +2
-2@@ -105,7 +105,7 @@ static int mantis_dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)if (mantis->feeds ==1 ) {dprintk (MANTIS_DEBUG ,1 ,"mantis start feed & dma" );mantis_dma_start (mantis); -tasklet_enable (&mantis->tasklet); +enable_and_queue_work (system_bh_wq, &mantis->work); }return mantis->feeds;@@ -125,7 +125,7 @@ static int mantis_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) mantis->feeds--;if (mantis->feeds ==0 ) {dprintk (MANTIS_DEBUG ,1 ,"mantis stop feed and dma" ); -tasklet_disable (&mantis->tasklet); +disable_work_sync (&mantis->work);mantis_dma_stop (mantis); }
drivers/media/pci/mantis/mantis_dvb.c int mantis_dvb_init(struct mantis_pci *mantis) · line 208
Quoted 6 lines
drivers/media/pci/mantis/mantis_dvb.c +1
-2@@ -205,8 +205,8 @@ int mantis_dvb_init(struct mantis_pci *mantis) }dvb_net_init (&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx); -tasklet_setup (&mantis->tasklet, mantis_dma_xfer); -tasklet_disable (&mantis->tasklet); +INIT_WORK (&mantis->bh, mantis_dma_xfer);
This fails to compile: mantis->bh -> mantis->work
Quoted 35 lines
drivers/media/pci/mantis/mantis_dvb.c +3
-2+disable_work_sync (&mantis->work);if (mantis->hwconfig) { result = config->frontend_init (mantis, mantis->fe);if (result <0 ) {@@ -235,7 +235,7 @@ int mantis_dvb_init(struct mantis_pci *mantis)/* Error conditions .. */ err5: -tasklet_kill (&mantis->tasklet); +cancel_work_sync (&mantis->work);dvb_net_release (&mantis->dvbnet);if (mantis->fe) {dvb_unregister_frontend (mantis->fe);@@ -273,7 +273,7 @@ int mantis_dvb_exit(struct mantis_pci *mantis)dvb_frontend_detach (mantis->fe); } -tasklet_kill (&mantis->tasklet); +cancel_work_sync (&mantis->work);dvb_net_release (&mantis->dvbnet); mantis->demux.dmx.remove_frontend (&mantis->demux.dmx, &mantis->fe_mem);drivers/media/pci/ngene/ngene-core.c +1
-0@@ -21,6 +21,7 @@#include <linux/byteorder/generic.h> #include <linux/firmware.h> #include <linux/vmalloc.h> +#include <linux/workqueue.h> #include "ngene.h"
drivers/media/pci/ngene/ngene-core.c DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); · line 56
Quoted 8 lines
drivers/media/pci/ngene/ngene-core.c +2
-2@@ -50,9 +51,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);/* nGene interrupt handler **************************************************/ /****************************************************************************/ -static void event_tasklet (struct tasklet_struct *t) +static void event_work (struct work_struct *t) { -struct ngene *dev =from_tasklet (dev, t, event_tasklet); +struct ngene *dev =from_work (dev, t, event_work);
So this becomes event_bh_work...
drivers/media/pci/ngene/ngene-core.c static void event_tasklet(struct tasklet_struct *t) · line 74
Quoted 12 lines
drivers/media/pci/ngene/ngene-core.c +2
-2while (dev->EventQueueReadIndex != dev->EventQueueWriteIndex) { struct EVENT_BUFFER Event =@@ -68,9 +69,9 @@ static void event_tasklet(struct tasklet_struct *t) } } -static void demux_tasklet (struct tasklet_struct *t) +static void demux_work (struct work_struct *t) { -struct ngene_channel *chan =from_tasklet (chan, t, demux_tasklet); +struct ngene_channel *chan =from_work (chan, t, demux_work);
...amd this demux_bh_work, etc.
Quoted 72 lines
drivers/media/pci/ngene/ngene-core.c +7
-7struct device *pdev = &chan->dev->pci_dev->dev;struct SBufferHeader *Cur = chan->nextBuffer;@@ -204,7 +205,7 @@ static irqreturn_t irq_handler(int irq, void *dev_id) dev->EventQueueOverflowFlag =1 ; } dev->EventBuffer->EventStatus &= ~0x80 ; -tasklet_schedule (&dev->event_tasklet); +queue_work (system_bh_wq, &dev->event_work); rc =IRQ_HANDLED ; }@@ -217,8 +218,8 @@ static irqreturn_t irq_handler(int irq, void *dev_id) ngeneBuffer.SR.Flags & 0xC0) == 0x80) { dev->channel[i].nextBuffer-> ngeneBuffer.SR.Flags |=0x40 ; -tasklet_schedule ( - &dev->channel[i].demux_tasklet); +queue_work (system_bh_wq, + &dev->channel[i].demux_work); rc =IRQ_HANDLED ; } }@@ -1181,7 +1182,7 @@ static void ngene_init(struct ngene *dev)struct device *pdev = &dev->pci_dev->dev;int i; -tasklet_setup (&dev->event_tasklet, event_tasklet); +INIT_WORK (&dev->event_work, event_work);memset_io (dev->iomem +0xc000 ,0x00 ,0x220 );memset_io (dev->iomem +0xc400 ,0x00 ,0x100 );@@ -1395,7 +1396,7 @@ static void release_channel(struct ngene_channel *chan)if (chan->running)set_transfer (chan,0 ); -tasklet_kill (&chan->demux_tasklet); +cancel_work_sync (&chan->demux_work);if (chan->ci_dev) {dvb_unregister_device (chan->ci_dev);@@ -1445,7 +1446,7 @@ static int init_channel(struct ngene_channel *chan)struct ngene_info *ni = dev->card_info;int io = ni->io_type[nr]; -tasklet_setup (&chan->demux_tasklet, demux_tasklet); +INIT_WORK (&chan->demux_work, demux_work); chan->users =0 ; chan->type = io; chan->mode = chan->type;/* for now only one mode */ @@ -1647,7 +1648,7 @@ void ngene_remove(struct pci_dev *pdev)struct ngene *dev =pci_get_drvdata (pdev);int i; -tasklet_kill (&dev->event_tasklet); +cancel_work_sync (&dev->event_work);for (i =MAX_STREAM -1 ; i >=0 ; i--)release_channel (&dev->channel[i]);if (dev->ci.en)drivers/media/pci/ngene/ngene.h +1
-0@@ -16,6 +16,7 @@#include <linux/scatterlist.h> #include <linux/dvb/frontend.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h>
drivers/media/pci/ngene/ngene.h struct ngene_channel { · line 625
Quoted 5 lines
drivers/media/pci/ngene/ngene.h +1
-1@@ -621,7 +622,7 @@ struct ngene_channel {int users;struct video_device *v4l_dev;struct dvb_device *ci_dev; -struct tasklet_struct demux_tasklet; +struct work_struct demux_work;
Alignment
drivers/media/pci/ngene/ngene.h struct ngene { · line 721
Quoted 9 lines
drivers/media/pci/ngene/ngene.h +1
-1struct SBufferHeader *nextBuffer;enum KSSTATE State;@@ -717,7 +718,7 @@ struct ngene {struct EVENT_BUFFER EventQueue[EVENT_QUEUE_SIZE ];int EventQueueOverflowCount;int EventQueueOverflowFlag; -struct tasklet_struct event_tasklet; +struct work_struct event_work;
Alignment. Please check this patch for other cases.
Quoted 310 lines
drivers/media/pci/ngene/ngene.h +0
-0struct EVENT_BUFFER *EventBuffer;int EventQueueWriteIndex;int EventQueueReadIndex;drivers/media/pci/smipcie/smipcie-main.c +9
-9@@ -279,10 +279,10 @@ static void smi_port_clearInterrupt(struct smi_port *port) (port->_dmaInterruptCH0 | port->_dmaInterruptCH1)); } -/* tasklet handler: DMA data to dmx.*/ -static void smi_dma_xfer (struct tasklet_struct *t) +/* work handler: DMA data to dmx.*/ +static void smi_dma_xfer (struct work_struct *t) { -struct smi_port *port =from_tasklet (port, t, tasklet); +struct smi_port *port =from_work (port, t, work);struct smi_dev *dev = port->dev;u32 intr_status, finishedData, dmaManagement;u8 dmaChan0State, dmaChan1State;@@ -426,8 +426,8 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed) }smi_port_disableInterrupt (port); -tasklet_setup (&port->tasklet, smi_dma_xfer); -tasklet_disable (&port->tasklet); +INIT_WORK (&port->work, smi_dma_xfer); +disable_work_sync (&port->work); port->enable =1 ;return 0 ; err:@@ -438,7 +438,7 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed)static void smi_port_exit (struct smi_port *port) {smi_port_disableInterrupt (port); -tasklet_kill (&port->tasklet); +cancel_work_sync (&port->work);smi_port_dma_free (port); port->enable =0 ; }@@ -452,7 +452,7 @@ static int smi_port_irq(struct smi_port *port, u32 int_status)smi_port_disableInterrupt (port); port->_int_status = int_status;smi_port_clearInterrupt (port); -tasklet_schedule (&port->tasklet); +queue_work (system_bh_wq, &port->work); handled =1 ; }return handled;@@ -823,7 +823,7 @@ static int smi_start_feed(struct dvb_demux_feed *dvbdmxfeed)smi_port_clearInterrupt (port);smi_port_enableInterrupt (port);smi_write (port->DMA_MANAGEMENT, dmaManagement); -tasklet_enable (&port->tasklet); +enable_and_queue_work (system_bh_wq, &port->work); }return port->users; }@@ -837,7 +837,7 @@ static int smi_stop_feed(struct dvb_demux_feed *dvbdmxfeed)if (--port->users)return port->users; -tasklet_disable (&port->tasklet); +disable_work_sync (&port->work);smi_port_disableInterrupt (port);smi_clear (port->DMA_MANAGEMENT,0x30003 );return 0 ;drivers/media/pci/smipcie/smipcie.h +2
-1@@ -17,6 +17,7 @@#include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/slab.h> +#include <linux/workqueue.h> #include <media/rc-core.h> #include <media/demux.h> @@ -257,7 +258,7 @@ struct smi_port {u32 _dmaInterruptCH0;u32 _dmaInterruptCH1;u32 _int_status; -struct tasklet_struct tasklet; +struct work_struct work;/* dvb */ struct dmx_frontend hw_frontend;struct dmx_frontend mem_frontend;drivers/media/pci/ttpci/budget-av.c +2
-1@@ -37,6 +37,7 @@#include <linux/interrupt.h> #include <linux/input.h> #include <linux/spinlock.h> +#include <linux/workqueue.h> #include <media/dvb_ca_en50221.h> @@ -55,7 +56,7 @@ struct budget_av {struct video_device vd;int cur_input;int has_saa7113; -struct tasklet_struct ciintf_irq_tasklet; +struct work_struct ciintf_irq_work;int slot_status;struct dvb_ca_en50221 ca; u8 reinitialise_demod:1;drivers/media/pci/ttpci/budget-ci.c +14
-13@@ -17,6 +17,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/spinlock.h> +#include <linux/workqueue.h> #include <media/rc-core.h> #include "budget.h" @@ -80,7 +81,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);struct budget_ci_ir {struct rc_dev *dev; -struct tasklet_struct msp430_irq_tasklet; +struct work_struct msp430_irq_work;char name[72 ];/* 40 + 32 for (struct saa7146_dev).name */ char phys[32 ];int rc5_device;@@ -91,7 +92,7 @@ struct budget_ci_ir {struct budget_ci {struct budget budget; -struct tasklet_struct ciintf_irq_tasklet; +struct work_struct ciintf_irq_work;int slot_status;int ci_irq;struct dvb_ca_en50221 ca;@@ -99,9 +100,9 @@ struct budget_ci {u8 tuner_pll_address;/* used for philips_tdm1316l configs */ }; -static void msp430_ir_interrupt (struct tasklet_struct *t) +static void msp430_ir_interrupt (struct work_struct *t) { -struct budget_ci_ir *ir =from_tasklet (ir, t, msp430_irq_tasklet); +struct budget_ci_ir *ir =from_work (ir, t, msp430_irq_work);struct budget_ci *budget_ci =container_of (ir,typeof (*budget_ci), ir);struct rc_dev *dev = budget_ci->ir.dev;u32 command =ttpci_budget_debiread (&budget_ci->budget,DEBINOSWAP ,DEBIADDR_IR ,2 ,1 ,0 ) >>8 ;@@ -230,7 +231,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) budget_ci->ir.dev = dev; -tasklet_setup (&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt); +INIT_WORK (&budget_ci->ir.msp430_irq_work, msp430_ir_interrupt);SAA7146_IER_ENABLE (saa,MASK_06 );saa7146_setgpio (saa,3 ,SAA7146_GPIO_IRQHI );@@ -244,7 +245,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)SAA7146_IER_DISABLE (saa,MASK_06 );saa7146_setgpio (saa,3 ,SAA7146_GPIO_INPUT ); -tasklet_kill (&budget_ci->ir.msp430_irq_tasklet); +cancel_work_sync (&budget_ci->ir.msp430_irq_work);rc_unregister_device (budget_ci->ir.dev); }@@ -348,10 +349,10 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)return 0 ; } -static void ciintf_interrupt (struct tasklet_struct *t) +static void ciintf_interrupt (struct work_struct *t) { -struct budget_ci *budget_ci =from_tasklet (budget_ci, t, - ciintf_irq_tasklet); +struct budget_ci *budget_ci =from_work (budget_ci, t, + ciintf_irq_work);struct saa7146_dev *saa = budget_ci->budget.dev;unsigned int flags;@@ -492,7 +493,7 @@ static int ciintf_init(struct budget_ci *budget_ci)// Setup CI slot IRQ if (budget_ci->ci_irq) { -tasklet_setup (&budget_ci->ciintf_irq_tasklet, ciintf_interrupt); +INIT_WORK (&budget_ci->ciintf_irq_work, ciintf_interrupt);if (budget_ci->slot_status !=SLOTSTATUS_NONE ) {saa7146_setgpio (saa,0 ,SAA7146_GPIO_IRQLO ); }else {@@ -532,7 +533,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)if (budget_ci->ci_irq) {SAA7146_IER_DISABLE (saa,MASK_03 );saa7146_setgpio (saa,0 ,SAA7146_GPIO_INPUT ); -tasklet_kill (&budget_ci->ciintf_irq_tasklet); +cancel_work_sync (&budget_ci->ciintf_irq_work); }// reset interface @@ -558,13 +559,13 @@ static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)dprintk (8 ,"dev: %p, budget_ci: %p\n" , dev, budget_ci);if (*isr &MASK_06 ) -tasklet_schedule (&budget_ci->ir.msp430_irq_tasklet); +queue_work (system_bh_wq, &budget_ci->ir.msp430_irq_work);if (*isr &MASK_10 )ttpci_budget_irq10_handler (dev, isr);if ((*isr &MASK_03 ) && (budget_ci->budget.ci_present) && (budget_ci->ci_irq)) -tasklet_schedule (&budget_ci->ciintf_irq_tasklet); +queue_work (system_bh_wq, &budget_ci->ciintf_irq_work); }static u8 philips_su1278_tt_inittab[] = {drivers/media/pci/ttpci/budget-core.c +5
-5@@ -171,9 +171,9 @@ static int budget_read_fe_status(struct dvb_frontend *fe,return ret; } -static void vpeirq (struct tasklet_struct *t) +static void vpeirq (struct work_struct *t) { -struct budget *budget =from_tasklet (budget, t, vpe_tasklet); +struct budget *budget =from_work (budget, t, vpe_work);u8 *mem = (u8 *) (budget->grabbing);u32 olddma = budget->ttbp;u32 newdma =saa7146_read (budget->dev,PCI_VDP3 );@@ -520,7 +520,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,/* upload all */ saa7146_write (dev,GPIO_CTRL ,0x000000 ); -tasklet_setup (&budget->vpe_tasklet, vpeirq); +INIT_WORK (&budget->vpe_work, vpeirq);/* frontend power on */ if (bi->type !=BUDGET_FS_ACTIVY )@@ -557,7 +557,7 @@ int ttpci_budget_deinit(struct budget *budget)budget_unregister (budget); -tasklet_kill (&budget->vpe_tasklet); +cancel_work_sync (&budget->vpe_work);saa7146_vfree_destroy_pgtable (dev->pci, budget->grabbing, &budget->pt);@@ -575,7 +575,7 @@ void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr)dprintk (8 ,"dev: %p, budget: %p\n" , dev, budget);if (*isr &MASK_10 ) -tasklet_schedule (&budget->vpe_tasklet); +queue_work (system_bh_wq, &budget->vpe_work); }void ttpci_budget_set_video_port (struct saa7146_dev *dev,int video_port)drivers/media/pci/ttpci/budget.h +3
-2@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <media/drv-intf/saa7146.h> @@ -49,8 +50,8 @@ struct budget {unsigned char *grabbing;struct saa7146_pgtable pt; -struct tasklet_struct fidb_tasklet; -struct tasklet_struct vpe_tasklet; +struct work_struct fidb_work; +struct work_struct vpe_work;struct dmxdev dmxdev;struct dvb_demux demux;drivers/media/pci/tw5864/tw5864-core.c +1
-1@@ -144,7 +144,7 @@ static void tw5864_h264_isr(struct tw5864_dev *dev) cur_frame->gop_seqno = input->frame_gop_seqno; dev->h264_buf_w_index = next_frame_index; -tasklet_schedule (&dev->tasklet); +queue_work (system_bh_wq, &dev->work); cur_frame = next_frame;drivers/media/pci/tw5864/tw5864-video.c +1
-0@@ -6,6 +6,7 @@*/ #include <linux/module.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-event.h> #include <media/videobuf2-dma-contig.h>
drivers/media/pci/tw5864/tw5864-video.c static const unsigned int intra4x4_lambda3[] = { · line 179
Quoted 5 lines
drivers/media/pci/tw5864/tw5864-video.c +1
-1@@ -175,7 +176,7 @@ static const unsigned int intra4x4_lambda3[] = {static v4l2_std_id tw5864_get_v4l2_std (enum tw5864_vid_std std);static enum tw5864_vid_std tw5864_from_v4l2_std (v4l2_std_id v4l2_std); -static void tw5864_handle_frame_task (struct tasklet_struct *t); +static void tw5864_handle_frame_task (struct work_struct *t);
I think _task should be renamed to _work.
Quoted 94 lines
drivers/media/pci/tw5864/tw5864-video.c +5
-5static void tw5864_handle_frame (struct tw5864_h264_frame *frame);static void tw5864_frame_interval_set (struct tw5864_input *input);@@ -1062,7 +1063,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr) dev->irqmask |=TW5864_INTR_VLC_DONE |TW5864_INTR_TIMER ;tw5864_irqmask_apply (dev); -tasklet_setup (&dev->tasklet, tw5864_handle_frame_task); +INIT_WORK (&dev->work, tw5864_handle_frame_task);for (i =0 ; i <TW5864_INPUTS ; i++) { dev->inputs[i].root = dev;@@ -1079,7 +1080,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr)for (i = last_input_nr_registered; i >=0 ; i--)tw5864_video_input_fini (&dev->inputs[i]); -tasklet_kill (&dev->tasklet); +cancel_work_sync (&dev->work); free_dma:for (i = last_dma_allocated; i >=0 ; i--) {@@ -1198,7 +1199,7 @@ void tw5864_video_fini(struct tw5864_dev *dev) {int i; -tasklet_kill (&dev->tasklet); +cancel_work_sync (&dev->work);for (i =0 ; i <TW5864_INPUTS ; i++)tw5864_video_input_fini (&dev->inputs[i]);@@ -1315,9 +1316,9 @@ static int tw5864_is_motion_triggered(struct tw5864_h264_frame *frame)return detected; } -static void tw5864_handle_frame_task (struct tasklet_struct *t) +static void tw5864_handle_frame_task (struct work_struct *t) { -struct tw5864_dev *dev =from_tasklet (dev, t, tasklet); +struct tw5864_dev *dev =from_work (dev, t, work);unsigned long flags;int batch_size =H264_BUF_CNT ;drivers/media/pci/tw5864/tw5864.h +4
-3@@ -12,6 +12,7 @@#include <linux/mutex.h> #include <linux/io.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> @@ -85,7 +86,7 @@ struct tw5864_input {int nr;/* input number */ struct tw5864_dev *root;struct mutex lock;/* used for vidq and vdev */ -spinlock_t slock;/* used for sync between ISR, tasklet & V4L2 API */ +spinlock_t slock;/* used for sync between ISR, work & V4L2 API */ struct video_device vdev;struct v4l2_ctrl_handler hdl;struct vb2_queue vidq;@@ -142,7 +143,7 @@ struct tw5864_h264_frame {/* global device status */ struct tw5864_dev { -spinlock_t slock;/* used for sync between ISR, tasklet & V4L2 API */ +spinlock_t slock;/* used for sync between ISR, work & V4L2 API */ struct v4l2_device v4l2_dev;struct tw5864_input inputs[TW5864_INPUTS ];#define H264_BUF_CNT 4@@ -150,7 +151,7 @@ struct tw5864_dev {int h264_buf_r_index;int h264_buf_w_index; -struct tasklet_struct tasklet; +struct work_struct work;int encoder_busy;/* Input number to check next for ready raw picture (in RR fashion) */ drivers/media/platform/intel/pxa_camera.c +1
-0@@ -43,6 +43,7 @@#include <linux/videodev2.h> #include <linux/platform_data/media/camera-pxa.h> +#include <linux/workqueue.h> #define PXA_CAM_VERSION "0.0.6"#define PXA_CAM_DRV_NAME "pxa27x-camera"
drivers/media/platform/intel/pxa_camera.c struct pxa_camera_dev { · line 687
Quoted 5 lines
drivers/media/platform/intel/pxa_camera.c +1
-1@@ -683,7 +684,7 @@ struct pxa_camera_dev {unsigned int buf_sequence;struct pxa_buffer *active; -struct tasklet_struct task_eof; +struct work_struct task_eof;
This should be renamed to eof_bh_work for consistency.
Quoted 76 lines
drivers/media/platform/intel/pxa_camera.c +6
-6u32 save_cicr[5 ]; };@@ -1146,9 +1147,9 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)clk_disable_unprepare (pcdev->clk); } -static void pxa_camera_eof (struct tasklet_struct *t) +static void pxa_camera_eof (struct work_struct *t) { -struct pxa_camera_dev *pcdev =from_tasklet (pcdev, t, task_eof); +struct pxa_camera_dev *pcdev =from_work (pcdev, t, task_eof);unsigned long cifr;struct pxa_buffer *buf;@@ -1185,7 +1186,7 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)if (status &CISR_EOF ) { cicr0 =__raw_readl (pcdev->base +CICR0 ) |CICR0_EOFM ;__raw_writel (cicr0, pcdev->base +CICR0 ); -tasklet_schedule (&pcdev->task_eof); +queue_work (system_bh_wq, &pcdev->task_eof); }return IRQ_HANDLED ;@@ -2383,7 +2384,7 @@ static int pxa_camera_probe(struct platform_device *pdev) } } -tasklet_setup (&pcdev->task_eof, pxa_camera_eof); +INIT_WORK (&pcdev->task_eof, pxa_camera_eof);pxa_camera_activate (pcdev);@@ -2409,7 +2410,7 @@ static int pxa_camera_probe(struct platform_device *pdev)return 0 ; exit_deactivate:pxa_camera_deactivate (pcdev); -tasklet_kill (&pcdev->task_eof); +cancel_work_sync (&pcdev->task_eof); exit_free_dma:dma_release_channel (pcdev->dma_chans[2 ]); exit_free_dma_u:@@ -2428,7 +2429,7 @@ static void pxa_camera_remove(struct platform_device *pdev)struct pxa_camera_dev *pcdev =platform_get_drvdata (pdev);pxa_camera_deactivate (pcdev); -tasklet_kill (&pcdev->task_eof); +cancel_work_sync (&pcdev->task_eof);dma_release_channel (pcdev->dma_chans[0 ]);dma_release_channel (pcdev->dma_chans[1 ]);dma_release_channel (pcdev->dma_chans[2 ]);drivers/media/platform/marvell/mcam-core.c +3
-2@@ -25,6 +25,7 @@#include <linux/clk-provider.h> #include <linux/videodev2.h> #include <linux/pm_runtime.h> +#include <linux/workqueue.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h> @@ -439,9 +440,9 @@ static void mcam_ctlr_dma_vmalloc(struct mcam_camera *cam)/* * Copy data out to user space in the vmalloc case */ -static void mcam_frame_tasklet (struct tasklet_struct *t) +static void mcam_frame_work (struct work_struct *t) { -struct mcam_camera *cam =from_tasklet (cam, t, s_tasklet); +struct mcam_camera *cam =from_work (cam, t, s_work);int i;unsigned long flags;struct mcam_vb_buffer *buf;
drivers/media/platform/marvell/mcam-core.c static void mcam_frame_tasklet(struct tasklet_struct *t) · line 484
Quoted 5 lines
drivers/media/platform/marvell/mcam-core.c +1
-1@@ -480,7 +481,7 @@ static void mcam_frame_tasklet(struct tasklet_struct *t)/* -* Make sure our allocated buffers are up to the task. +* Make sure our allocated buffers are up to the work.
Drop this change: "up to the task" is an English expression, it doesn't refer to a tasklet :-)
Quoted 129 lines
drivers/media/platform/marvell/mcam-core.c +2
-2*/ static int mcam_check_dma_buffers (struct mcam_camera *cam) {@@ -493,7 +494,7 @@ static int mcam_check_dma_buffers(struct mcam_camera *cam)static void mcam_vmalloc_done (struct mcam_camera *cam,int frame) { -tasklet_schedule (&cam->s_tasklet); +queue_work (system_bh_wq, &cam->s_work); }#else /* MCAM_MODE_VMALLOC */ @@ -1305,7 +1306,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam)break ;case B_vmalloc:#ifdef MCAM_MODE_VMALLOC -tasklet_setup (&cam->s_tasklet, mcam_frame_tasklet); +INIT_WORK (&cam->s_work, mcam_frame_work); vq->ops = &mcam_vb2_ops; vq->mem_ops = &vb2_vmalloc_memops; cam->dma_setup = mcam_ctlr_dma_vmalloc;drivers/media/platform/marvell/mcam-core.h +2
-1@@ -9,6 +9,7 @@#include <linux/list.h> #include <linux/clk-provider.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-dev.h> @@ -167,7 +168,7 @@ struct mcam_camera {unsigned int dma_buf_size;/* allocated size */ void *dma_bufs[MAX_DMA_BUFS ];/* Internal buffer addresses */ dma_addr_t dma_handles[MAX_DMA_BUFS ];/* Buffer bus addresses */ -struct tasklet_struct s_tasklet; +struct work_struct s_work;#endif unsigned int sequence;/* Frame sequence number */ unsigned int buf_seq[MAX_DMA_BUFS ];/* Sequence for individual bufs */ drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +8
-7@@ -33,6 +33,7 @@#include <linux/time.h> #include <linux/usb.h> #include <linux/wait.h> +#include <linux/workqueue.h> #include "c8sectpfe-common.h" #include "c8sectpfe-core.h" @@ -73,16 +74,16 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t)/* is this descriptor initialised and TP enabled */ if (channel->irec &&readl (channel->irec +DMA_PRDS_TPENABLE )) -tasklet_schedule (&channel->tsklet); +queue_work (system_bh_wq, &channel->work); } fei->timer.expires = jiffies +msecs_to_jiffies (POLL_MSECS );add_timer (&fei->timer); } -static void channel_swdemux_tsklet (struct tasklet_struct *t) +static void channel_swdemux_work (struct work_struct *t) { -struct channel_info *channel =from_tasklet (channel, t, tsklet); +struct channel_info *channel =from_work (channel, t, work);struct c8sectpfei *fei;unsigned long wp, rp;int pos, num_packets, n, size;@@ -211,7 +212,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed)dev_dbg (fei->dev,"Starting channel=%p\n" , channel); -tasklet_setup (&channel->tsklet, channel_swdemux_tsklet); +INIT_WORK (&channel->work, channel_swdemux_work);/* Reset the internal inputblock sram pointers */ writel(channel->fifo,@@ -304,7 +305,7 @@ static int c8sectpfe_stop_feed(struct dvb_demux_feed *dvbdmxfeed)/* disable this channels descriptor */ writel (0 , channel->irec +DMA_PRDS_TPENABLE ); -tasklet_disable (&channel->tsklet); +disable_work_sync (&channel->work);/* now request memdma channel goes idle */ idlereq = (1 << channel->tsin_id) |IDLEREQ ;@@ -631,8 +632,8 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei,writel (tsin->back_buffer_busaddr, tsin->irec +DMA_PRDS_BUSWP_TP (0 ));writel (tsin->back_buffer_busaddr, tsin->irec +DMA_PRDS_BUSRP_TP (0 )); -/* initialize tasklet */ -tasklet_setup (&tsin->tsklet, channel_swdemux_tsklet); +/* initialize work */ +INIT_WORK (&tsin->work, channel_swdemux_work);return 0 ;drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.h +1
-1@@ -51,7 +51,7 @@ struct channel_info {unsigned long fifo;struct completion idle_completion; -struct tasklet_struct tsklet; +struct work_struct work;struct c8sectpfei *fei;void __iomem *irec;drivers/media/radio/wl128x/fmdrv.h +1
-0@@ -15,6 +15,7 @@#include <sound/core.h> #include <sound/initval.h> #include <linux/timer.h> +#include <linux/workqueue.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h>
drivers/media/radio/wl128x/fmdrv.h struct fmdev { · line 204
Quoted 5 lines
drivers/media/radio/wl128x/fmdrv.h +1
-1@@ -200,15 +201,15 @@ struct fmdev {int streg_cbdata;/* status of ST registration */ struct sk_buff_head rx_q;/* RX queue */ -struct tasklet_struct rx_task;/* RX Tasklet */ +struct work_struct rx_task;/* RX Work */
Rename to rx_bh_work
drivers/media/radio/wl128x/fmdrv.h struct fmdev { · line 207
Quoted 4 lines
drivers/media/radio/wl128x/fmdrv.h +1
-1struct sk_buff_head tx_q;/* TX queue */ -struct tasklet_struct tx_task;/* TX Tasklet */ +struct work_struct tx_task;/* TX Work */
Ditto.
Quoted 248 lines
drivers/media/radio/wl128x/fmdrv.h +1
-1unsigned long last_tx_jiffies;/* Timestamp of last pkt sent */ atomic_t tx_cnt;/* Number of packets can send at a time */ struct sk_buff *resp_skb;/* Response from the chip */ -/* Main task completion handler */ +/* Main work completion handler */ struct completion maintask_comp;/* Opcode of last command sent to the chip */ u8 pre_op;drivers/media/radio/wl128x/fmdrv_common.c +21
-20@@ -9,7 +9,7 @@* one Channel-8 command to be sent to the chip). * 2) Sending each Channel-8 command to the chip and reading * response back over Shared Transport. -* 3) Managing TX and RX Queues and Tasklets. +* 3) Managing TX and RX Queues and Work. * 4) Handling FM Interrupt packet and taking appropriate action. * 5) Loading FM firmware to the chip (common, FM TX, and FM RX * firmware files based on mode selection) @@ -29,6 +29,7 @@#include "fmdrv_v4l2.h" #include "fmdrv_common.h" #include <linux/ti_wilink_st.h> +#include <linux/workqueue.h> #include "fmdrv_rx.h" #include "fmdrv_tx.h" @@ -244,10 +245,10 @@ void fmc_update_region_info(struct fmdev *fmdev, u8 region_to_set) }/* -* FM common sub-module will schedule this tasklet whenever it receives +* FM common sub-module will queue this work whenever it receives * FM packet from ST driver. */ -static void recv_tasklet (struct tasklet_struct *t) +static void recv_work (struct work_struct *t) {struct fmdev *fmdev;struct fm_irq *irq_info;@@ -256,7 +257,7 @@ static void recv_tasklet(struct tasklet_struct *t)u8 num_fm_hci_cmds;unsigned long flags; - fmdev =from_tasklet (fmdev, t, tx_task); + fmdev =from_work (fmdev, t, tx_task); irq_info = &fmdev->irq_info;/* Process all packets in the RX queue */ while ((skb =skb_dequeue (&fmdev->rx_q))) {@@ -322,22 +323,22 @@ static void recv_tasklet(struct tasklet_struct *t)/* * Check flow control field. If Num_FM_HCI_Commands field is -* not zero, schedule FM TX tasklet. +* not zero, queue FM TX work. */ if (num_fm_hci_cmds &&atomic_read (&fmdev->tx_cnt))if (!skb_queue_empty (&fmdev->tx_q)) -tasklet_schedule (&fmdev->tx_task); +queue_work (system_bh_wq, &fmdev->tx_task); } } -/* FM send tasklet: is scheduled when FM packet has to be sent to chip */ -static void send_tasklet (struct tasklet_struct *t) +/* FM send work: is scheduled when FM packet has to be sent to chip */ +static void send_work (struct work_struct *t) {struct fmdev *fmdev;struct sk_buff *skb;int len; - fmdev =from_tasklet (fmdev, t, tx_task); + fmdev =from_work (fmdev, t, tx_task);if (!atomic_read (&fmdev->tx_cnt))return ;@@ -366,7 +367,7 @@ static void send_tasklet(struct tasklet_struct *t)if (len <0 ) {kfree_skb (skb); fmdev->resp_comp =NULL ; -fmerr ("TX tasklet failed to send skb(%p)\n" , skb); +fmerr ("TX work failed to send skb(%p)\n" , skb);atomic_set (&fmdev->tx_cnt,1 ); }else { fmdev->last_tx_jiffies = jiffies;@@ -374,7 +375,7 @@ static void send_tasklet(struct tasklet_struct *t) }/* -* Queues FM Channel-8 packet to FM TX queue and schedules FM TX tasklet for +* Queues FM Channel-8 packet to FM TX queue and schedules FM TX work for * transmission */ static int fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,@@ -440,7 +441,7 @@ static int fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,fm_cb (skb)->completion = wait_completion;skb_queue_tail (&fmdev->tx_q, skb); -tasklet_schedule (&fmdev->tx_task); +queue_work (system_bh_wq, &fmdev->tx_task);return 0 ; }@@ -462,7 +463,7 @@ int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,if (!wait_for_completion_timeout (&fmdev->maintask_comp,FM_DRV_TX_TIMEOUT )) { -fmerr ("Timeout(%d sec),didn't get regcompletion signal from RX tasklet\n" , +fmerr ("Timeout(%d sec),didn't get regcompletion signal from RX work\n" ,jiffies_to_msecs (FM_DRV_TX_TIMEOUT ) /1000 );return -ETIMEDOUT ; }@@ -1455,7 +1456,7 @@ static long fm_st_receive(void *arg, struct sk_buff *skb)memcpy (skb_push (skb,1 ), &skb->cb[0 ],1 );skb_queue_tail (&fmdev->rx_q, skb); -tasklet_schedule (&fmdev->rx_task); +queue_work (system_bh_wq, &fmdev->rx_task);return 0 ; }@@ -1537,13 +1538,13 @@ int fmc_prepare(struct fmdev *fmdev)spin_lock_init (&fmdev->rds_buff_lock);spin_lock_init (&fmdev->resp_skb_lock); -/* Initialize TX queue and TX tasklet */ +/* Initialize TX queue and TX work */ skb_queue_head_init (&fmdev->tx_q); -tasklet_setup (&fmdev->tx_task, send_tasklet); +INIT_WORK (&fmdev->tx_task, send_work); -/* Initialize RX Queue and RX tasklet */ +/* Initialize RX Queue and RX work */ skb_queue_head_init (&fmdev->rx_q); -tasklet_setup (&fmdev->rx_task, recv_tasklet); +INIT_WORK (&fmdev->rx_task, recv_work); fmdev->irq_info.stage =0 ;atomic_set (&fmdev->tx_cnt,1 );@@ -1589,8 +1590,8 @@ int fmc_release(struct fmdev *fmdev)/* Service pending read */ wake_up_interruptible (&fmdev->rx.rds.read_queue); -tasklet_kill (&fmdev->tx_task); -tasklet_kill (&fmdev->rx_task); +cancel_work_sync (&fmdev->tx_task); +cancel_work_sync (&fmdev->rx_task);skb_queue_purge (&fmdev->tx_q);skb_queue_purge (&fmdev->rx_q);drivers/media/rc/mceusb.c +1
-1@@ -774,7 +774,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, u8 *buf, int buf_len,/* * Schedule work that can't be done in interrupt handlers -* (mceusb_dev_recv() and mce_write_callback()) nor tasklets. +* (mceusb_dev_recv() and mce_write_callback()) nor works. * Invokes mceusb_deferred_kevent() for recovering from * error events specified by the kevent bit field. */ drivers/media/usb/ttusb-dec/ttusb_dec.c +10
-9@@ -19,6 +19,7 @@#include <linux/input.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvb_demux.h> @@ -139,7 +140,7 @@ struct ttusb_dec {int v_pes_postbytes;struct list_head urb_frame_list; -struct tasklet_struct urb_tasklet; +struct work_struct urb_work;spinlock_t urb_frame_list_lock;struct dvb_demux_filter *audio_filter;@@ -766,9 +767,9 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, } } -static void ttusb_dec_process_urb_frame_list (struct tasklet_struct *t) +static void ttusb_dec_process_urb_frame_list (struct work_struct *t) { -struct ttusb_dec *dec =from_tasklet (dec, t, urb_tasklet); +struct ttusb_dec *dec =from_work (dec, t, urb_work);struct list_head *item;struct urb_frame *frame;unsigned long flags;@@ -822,7 +823,7 @@ static void ttusb_dec_process_urb(struct urb *urb)spin_unlock_irqrestore (&dec->urb_frame_list_lock, flags); -tasklet_schedule (&dec->urb_tasklet); +queue_work (system_bh_wq, &dec->urb_work); } } }else {@@ -1198,11 +1199,11 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)return 0 ; } -static void ttusb_dec_init_tasklet (struct ttusb_dec *dec) +static void ttusb_dec_init_work (struct ttusb_dec *dec) {spin_lock_init (&dec->urb_frame_list_lock);INIT_LIST_HEAD (&dec->urb_frame_list); -tasklet_setup (&dec->urb_tasklet, ttusb_dec_process_urb_frame_list); +INIT_WORK (&dec->urb_work, ttusb_dec_process_urb_frame_list); }static int ttusb_init_rc (struct ttusb_dec *dec)@@ -1588,12 +1589,12 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec)ttusb_dec_free_iso_urbs (dec); } -static void ttusb_dec_exit_tasklet (struct ttusb_dec *dec) +static void ttusb_dec_exit_work (struct ttusb_dec *dec) {struct list_head *item;struct urb_frame *frame; -tasklet_kill (&dec->urb_tasklet); +cancel_work_sync (&dec->urb_work);while ((item = dec->urb_frame_list.next) != &dec->urb_frame_list) { frame = list_entry(item, struct urb_frame, urb_frame_list);@@ -1703,7 +1704,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,ttusb_dec_init_v_pes (dec);ttusb_dec_init_filters (dec); -ttusb_dec_init_tasklet (dec); +ttusb_dec_init_work (dec); dec->active =1 ;
drivers/media/usb/ttusb-dec/ttusb_dec.c static void ttusb_dec_disconnect(struct usb_interface *intf) · line 1736
Quoted 8 lines
drivers/media/usb/ttusb-dec/ttusb_dec.c +1
-1@@ -1729,7 +1730,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf)dprintk ("%s\n" , __func__);if (dec->active) { -ttusb_dec_exit_tasklet (dec); +ttusb_dec_exit_work (dec);ttusb_dec_exit_filters (dec);if (enable_rc)ttusb_dec_exit_rc (dec);
Regards,
Hans
Quoted 56 lines · Hans Verkuil
Hi Allen,
Some review comments:
Regarding the Subject: instead of 'media/*:' just write 'media:'.
Quoted 45 lines · Allen Pais
The only generic interface to execute asynchronously in the BH context is tasklet; however, it's marked deprecated and has some design flaws. To replace tasklets, BH workqueue support was recently added. A BH workqueue behaves similarly to regular workqueues except that the queued work items are executed in the BH context.
This patch converts
drivers/media/*from tasklet to BH workqueue.Based on the work done by Tejun Heo <[email protected]>
Branch: https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-6.10Signed-off-by Allen Pais <[email protected]>---
drivers/media/pci/bt8xx/bt878.c | 8 ++-- drivers/media/pci/bt8xx/bt878.h | 3 +- drivers/media/pci/bt8xx/dvb-bt8xx.c | 9 ++-- drivers/media/pci/ddbridge/ddbridge.h | 2 +- drivers/media/pci/mantis/hopper_cards.c | 2 +- drivers/media/pci/mantis/mantis_cards.c | 2 +- drivers/media/pci/mantis/mantis_common.h | 2 +- drivers/media/pci/mantis/mantis_dma.c | 5 ++- drivers/media/pci/mantis/mantis_dma.h | 2 +- drivers/media/pci/mantis/mantis_dvb.c | 12 +++--- drivers/media/pci/ngene/ngene-core.c | 23 ++++++----- drivers/media/pci/ngene/ngene.h | 5 ++- drivers/media/pci/smipcie/smipcie-main.c | 18 ++++---- drivers/media/pci/smipcie/smipcie.h | 3 +- drivers/media/pci/ttpci/budget-av.c | 3 +- drivers/media/pci/ttpci/budget-ci.c | 27 ++++++------ drivers/media/pci/ttpci/budget-core.c | 10 ++--- drivers/media/pci/ttpci/budget.h | 5 ++- drivers/media/pci/tw5864/tw5864-core.c | 2 +- drivers/media/pci/tw5864/tw5864-video.c | 13 +++--- drivers/media/pci/tw5864/tw5864.h | 7 ++-- drivers/media/platform/intel/pxa_camera.c | 15 +++---- drivers/media/platform/marvell/mcam-core.c | 11 ++--- drivers/media/platform/marvell/mcam-core.h | 3 +- .../st/sti/c8sectpfe/c8sectpfe-core.c | 15 +++---- .../st/sti/c8sectpfe/c8sectpfe-core.h | 2 +- drivers/media/radio/wl128x/fmdrv.h | 7 ++-- drivers/media/radio/wl128x/fmdrv_common.c | 41 ++++++++++--------- drivers/media/rc/mceusb.c | 2 +- drivers/media/usb/ttusb-dec/ttusb_dec.c | 21 +++++----- 30 files changed, 149 insertions(+), 131 deletions(-)
Quoted 16 lines
drivers/media/pci/bt8xx/bt878.c static irqreturn_t bt878_irq(int irq, void *dev_id) · line 304
Quoted 12 lines
drivers/media/pci/bt8xx/bt878.c +2
-2@@ -300,8 +300,8 @@ static irqreturn_t bt878_irq(int irq, void *dev_id) }if (astat &BT878_ARISCI ) { bt->finished_block = (stat &BT878_ARISCS ) >>28 ; -if (bt->tasklet.callback) -tasklet_schedule (&bt->tasklet); +if (bt->work.func) +queue_work (system_bh_wq, &bt->work);I would prefer that 'work' is renamed to '
bh_work'. That way it is easy to identify it as part ofsystem_bh_wq. This is true for the other drivers in this patch as well, so I won't repeat this.
Will do.
Quoted 50 lines
Quoted 50 lines
drivers/media/pci/bt8xx/bt878.c +2
-2break ; } count++;@@ -478,8 +478,8 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)btwrite (0 ,BT878_AINT_MASK ); bt878_num++; -if (!bt->tasklet.func) -tasklet_disable (&bt->tasklet); +if (!bt->work.func) +disable_work_sync (&bt->work);return 0 ;drivers/media/pci/bt8xx/bt878.h +2
-1@@ -14,6 +14,7 @@#include <linux/sched.h> #include <linux/spinlock.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include "bt848.h" #include "bttv.h" @@ -120,7 +121,7 @@ struct bt878 {dma_addr_t risc_dma;u32 risc_pos; -struct tasklet_struct tasklet; +struct work_struct work;int shutdown; };drivers/media/pci/bt8xx/dvb-bt8xx.c +1
-0@@ -15,6 +15,7 @@#include <linux/delay.h> #include <linux/slab.h> #include <linux/i2c.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h> @@ -39,9 +40,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
Quoted 6 lines
drivers/media/pci/bt8xx/dvb-bt8xx.c DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); · line 43
Quoted 4 lines
drivers/media/pci/bt8xx/dvb-bt8xx.c +1
-1#define IF_FREQUENCYx6 217/* 6 * 36.16666666667MHz */ -static void dvb_bt8xx_task (struct tasklet_struct *t) +static void dvb_bt8xx_task (struct work_struct *t)I'd rename
_taskto_work.
Sure, will have it done.
Quoted 29 lines
Quoted 29 lines
drivers/media/pci/bt8xx/dvb-bt8xx.c +3
-3{ -struct bt878 *bt =from_tasklet (bt, t, tasklet); +struct bt878 *bt =from_work (bt, t, work);struct dvb_bt8xx_card *card =dev_get_drvdata (&bt->adapter->dev);dprintk ("%d\n" , card->bt->finished_block);@@ -782,7 +783,7 @@ static int dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type) goto err_disconnect_frontend; } -tasklet_setup (&card->bt->tasklet, dvb_bt8xx_task); +INIT_WORK (&card->bt->work, dvb_bt8xx_task);frontend_init (card, type);@@ -922,7 +923,7 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub)dprintk ("dvb_bt8xx: unloading card%d\n" , card->bttv_nr);bt878_stop (card->bt); -tasklet_kill (&card->bt->tasklet); +cancel_work_sync (&card->bt->work);dvb_net_release (&card->dvbnet); card->demux.dmx.remove_frontend (&card->demux.dmx, &card->fe_mem); card->demux.dmx.remove_frontend (&card->demux.dmx, &card->fe_hw);drivers/media/pci/ddbridge/ddbridge.h +0
-0
Quoted 8 lines
drivers/media/pci/ddbridge/ddbridge.h struct ddb_link { · line 301
Quoted 6 lines
drivers/media/pci/ddbridge/ddbridge.h +1
-1@@ -298,7 +298,7 @@ struct ddb_link {spinlock_t lock;/* lock link access */ struct mutex flash_mutex;/* lock flash access */ struct ddb_lnb lnb; -struct tasklet_struct tasklet; +struct work_struct work;Please keep the alignment so 'work' aligns with the other fields.
Sure.
Quoted 104 lines
Quoted 104 lines
drivers/media/pci/ddbridge/ddbridge.h +0
-0struct ddb_ids ids;spinlock_t temp_lock;/* lock temp chip access */ drivers/media/pci/mantis/hopper_cards.c +1
-1@@ -116,7 +116,7 @@ static irqreturn_t hopper_irq_handler(int irq, void *dev_id)if (stat &MANTIS_INT_RISCI ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[8 ]); mantis->busy_block = (stat &MANTIS_INT_RISCSTAT ) >>28 ; -tasklet_schedule (&mantis->tasklet); +queue_work (system_bh_wq, &mantis->work); }if (stat &MANTIS_INT_I2CDONE ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[9 ]);drivers/media/pci/mantis/mantis_cards.c +1
-1@@ -125,7 +125,7 @@ static irqreturn_t mantis_irq_handler(int irq, void *dev_id)if (stat &MANTIS_INT_RISCI ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[8 ]); mantis->busy_block = (stat &MANTIS_INT_RISCSTAT ) >>28 ; -tasklet_schedule (&mantis->tasklet); +queue_work (system_bh_wq, &mantis->work); }if (stat &MANTIS_INT_I2CDONE ) {dprintk (MANTIS_DEBUG ,0 ,"<%s>" , label[9 ]);drivers/media/pci/mantis/mantis_common.h +1
-1@@ -125,7 +125,7 @@ struct mantis_pci {__le32 *risc_cpu;dma_addr_t risc_dma; -struct tasklet_struct tasklet; +struct work_struct work;spinlock_t intmask_lock;struct i2c_adapter adapter;drivers/media/pci/mantis/mantis_dma.c +3
-2@@ -15,6 +15,7 @@#include <linux/signal.h> #include <linux/sched.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvbdev.h> @@ -200,9 +201,9 @@ void mantis_dma_stop(struct mantis_pci *mantis) } -void mantis_dma_xfer (struct tasklet_struct *t) +void mantis_dma_xfer (struct work_struct *t) { -struct mantis_pci *mantis =from_tasklet (mantis, t, tasklet); +struct mantis_pci *mantis =from_work (mantis, t, work);struct mantis_hwconfig *config = mantis->hwconfig;while (mantis->last_block != mantis->busy_block) {drivers/media/pci/mantis/mantis_dma.h +1
-1@@ -13,6 +13,6 @@ extern int mantis_dma_init(struct mantis_pci *mantis);extern int mantis_dma_exit (struct mantis_pci *mantis);extern void mantis_dma_start (struct mantis_pci *mantis);extern void mantis_dma_stop (struct mantis_pci *mantis); -extern void mantis_dma_xfer (struct tasklet_struct *t); +extern void mantis_dma_xfer (struct work_struct *t);#endif /* __MANTIS_DMA_H */ drivers/media/pci/mantis/mantis_dvb.c +2
-2@@ -105,7 +105,7 @@ static int mantis_dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)if (mantis->feeds ==1 ) {dprintk (MANTIS_DEBUG ,1 ,"mantis start feed & dma" );mantis_dma_start (mantis); -tasklet_enable (&mantis->tasklet); +enable_and_queue_work (system_bh_wq, &mantis->work); }return mantis->feeds;@@ -125,7 +125,7 @@ static int mantis_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed) mantis->feeds--;if (mantis->feeds ==0 ) {dprintk (MANTIS_DEBUG ,1 ,"mantis stop feed and dma" ); -tasklet_disable (&mantis->tasklet); +disable_work_sync (&mantis->work);mantis_dma_stop (mantis); }@@ -205,8 +205,8 @@ int mantis_dvb_init(struct mantis_pci *mantis) }
Quoted 6 lines
drivers/media/pci/mantis/mantis_dvb.c int mantis_dvb_init(struct mantis_pci *mantis) · line 208
Quoted 4 lines
drivers/media/pci/mantis/mantis_dvb.c +1
-2dvb_net_init (&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx); -tasklet_setup (&mantis->tasklet, mantis_dma_xfer); -tasklet_disable (&mantis->tasklet); +INIT_WORK (&mantis->bh, mantis_dma_xfer);This fails to compile:
mantis->bh->mantis->work
Will fix it.
Quoted 39 lines
Quoted 39 lines
drivers/media/pci/mantis/mantis_dvb.c +1
-0+disable_work_sync (&mantis->work);if (mantis->hwconfig) { result = config->frontend_init (mantis, mantis->fe);if (result <0 ) {@@ -235,7 +235,7 @@ int mantis_dvb_init(struct mantis_pci *mantis)/* Error conditions .. */ err5:
drivers/media/pci/mantis/mantis_dvb.c +1
-1-tasklet_kill (&mantis->tasklet); +cancel_work_sync (&mantis->work);dvb_net_release(&mantis->dvbnet); if (mantis->fe) { dvb_unregister_frontend(mantis->fe);drivers/media/pci/mantis/mantis_dvb.c +1
-1@@ -273,7 +273,7 @@ int mantis_dvb_exit(struct mantis_pci *mantis)dvb_frontend_detach (mantis->fe); } -tasklet_kill (&mantis->tasklet); +cancel_work_sync (&mantis->work);dvb_net_release (&mantis->dvbnet); mantis->demux.dmx.remove_frontend (&mantis->demux.dmx, &mantis->fe_mem);drivers/media/pci/ngene/ngene-core.c +1
-0@@ -21,6 +21,7 @@#include <linux/byteorder/generic.h> #include <linux/firmware.h> #include <linux/vmalloc.h> +#include <linux/workqueue.h> #include "ngene.h" @@ -50,9 +51,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);/* nGene interrupt handler **************************************************/ /****************************************************************************/
Quoted 7 lines
drivers/media/pci/ngene/ngene-core.c DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); · line 56
Quoted 5 lines
drivers/media/pci/ngene/ngene-core.c +2
-2-static void event_tasklet (struct tasklet_struct *t) +static void event_work (struct work_struct *t) { -struct ngene *dev =from_tasklet (dev, t, event_tasklet); +struct ngene *dev =from_work (dev, t, event_work);So this becomes
event_bh_work...
Yes, will fix it.
Quoted 8 lines
Quoted 8 lines
drivers/media/pci/ngene/ngene-core.c +0
-0while (dev->EventQueueReadIndex != dev->EventQueueWriteIndex) { struct EVENT_BUFFER Event =@@ -68,9 +69,9 @@ static void event_tasklet(struct tasklet_struct *t) } }
Quoted 7 lines
drivers/media/pci/ngene/ngene-core.c static void event_tasklet(struct tasklet_struct *t) · line 74
Quoted 5 lines
drivers/media/pci/ngene/ngene-core.c +2
-2-static void demux_tasklet (struct tasklet_struct *t) +static void demux_work (struct work_struct *t) { -struct ngene_channel *chan =from_tasklet (chan, t, demux_tasklet); +struct ngene_channel *chan =from_work (chan, t, demux_work);...amd this
demux_bh_work, etc.
Sure.
Quoted 70 lines
Quoted 70 lines
drivers/media/pci/ngene/ngene-core.c +7
-7struct device *pdev = &chan->dev->pci_dev->dev;struct SBufferHeader *Cur = chan->nextBuffer;@@ -204,7 +205,7 @@ static irqreturn_t irq_handler(int irq, void *dev_id) dev->EventQueueOverflowFlag =1 ; } dev->EventBuffer->EventStatus &= ~0x80 ; -tasklet_schedule (&dev->event_tasklet); +queue_work (system_bh_wq, &dev->event_work); rc =IRQ_HANDLED ; }@@ -217,8 +218,8 @@ static irqreturn_t irq_handler(int irq, void *dev_id) ngeneBuffer.SR.Flags & 0xC0) == 0x80) { dev->channel[i].nextBuffer-> ngeneBuffer.SR.Flags |=0x40 ; -tasklet_schedule ( - &dev->channel[i].demux_tasklet); +queue_work (system_bh_wq, + &dev->channel[i].demux_work); rc =IRQ_HANDLED ; } }@@ -1181,7 +1182,7 @@ static void ngene_init(struct ngene *dev)struct device *pdev = &dev->pci_dev->dev;int i; -tasklet_setup (&dev->event_tasklet, event_tasklet); +INIT_WORK (&dev->event_work, event_work);memset_io (dev->iomem +0xc000 ,0x00 ,0x220 );memset_io (dev->iomem +0xc400 ,0x00 ,0x100 );@@ -1395,7 +1396,7 @@ static void release_channel(struct ngene_channel *chan)if (chan->running)set_transfer (chan,0 ); -tasklet_kill (&chan->demux_tasklet); +cancel_work_sync (&chan->demux_work);if (chan->ci_dev) {dvb_unregister_device (chan->ci_dev);@@ -1445,7 +1446,7 @@ static int init_channel(struct ngene_channel *chan)struct ngene_info *ni = dev->card_info;int io = ni->io_type[nr]; -tasklet_setup (&chan->demux_tasklet, demux_tasklet); +INIT_WORK (&chan->demux_work, demux_work); chan->users =0 ; chan->type = io; chan->mode = chan->type;/* for now only one mode */ @@ -1647,7 +1648,7 @@ void ngene_remove(struct pci_dev *pdev)struct ngene *dev =pci_get_drvdata (pdev);int i; -tasklet_kill (&dev->event_tasklet); +cancel_work_sync (&dev->event_work);for (i =MAX_STREAM -1 ; i >=0 ; i--)release_channel (&dev->channel[i]);if (dev->ci.en)drivers/media/pci/ngene/ngene.h +1
-0@@ -16,6 +16,7 @@#include <linux/scatterlist.h> #include <linux/dvb/frontend.h> +#include <linux/workqueue.h>
Quoted 10 lines
drivers/media/pci/ngene/ngene.h struct ngene_channel { · line 625
Quoted 8 lines
drivers/media/pci/ngene/ngene.h +1
-1#include <media/dmxdev.h> #include <media/dvbdev.h> @@ -621,7 +622,7 @@ struct ngene_channel {int users;struct video_device *v4l_dev;struct dvb_device *ci_dev; -struct tasklet_struct demux_tasklet; +struct work_struct demux_work;Alignment
Will fix it.
Quoted 427 lines
drivers/media/pci/ngene/ngene.h struct ngene { · line 721
Quoted 10 lines
drivers/media/pci/ngene/ngene.h +1
-1struct SBufferHeader *nextBuffer;enum KSSTATE State;@@ -717,7 +718,7 @@ struct ngene {struct EVENT_BUFFER EventQueue[EVENT_QUEUE_SIZE ];int EventQueueOverflowCount;int EventQueueOverflowFlag; -struct tasklet_struct event_tasklet; +struct work_struct event_work;Alignment. Please check this patch for other cases.
Quoted 310 lines
drivers/media/pci/ngene/ngene.h +0
-0struct EVENT_BUFFER *EventBuffer;int EventQueueWriteIndex;int EventQueueReadIndex;drivers/media/pci/smipcie/smipcie-main.c +5
-5@@ -279,10 +279,10 @@ static void smi_port_clearInterrupt(struct smi_port *port) (port->_dmaInterruptCH0 | port->_dmaInterruptCH1)); } -/* tasklet handler: DMA data to dmx.*/ -static void smi_dma_xfer (struct tasklet_struct *t) +/* work handler: DMA data to dmx.*/ +static void smi_dma_xfer (struct work_struct *t) { -struct smi_port *port =from_tasklet (port, t, tasklet); +struct smi_port *port =from_work (port, t, work);struct smi_dev *dev = port->dev;u32 intr_status, finishedData, dmaManagement;u8 dmaChan0State, dmaChan1State;@@ -426,8 +426,8 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed) }smi_port_disableInterrupt (port); -tasklet_setup (&port->tasklet, smi_dma_xfer); -tasklet_disable (&port->tasklet); +INIT_WORK (&port->work, smi_dma_xfer); +disable_work_sync (&port->work); port->enable =1 ;return 0 ;err:
drivers/media/pci/smipcie/smipcie-main.c +4
-4@@ -438,7 +438,7 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed)static void smi_port_exit (struct smi_port *port) {smi_port_disableInterrupt (port); -tasklet_kill (&port->tasklet); +cancel_work_sync (&port->work);smi_port_dma_free (port); port->enable =0 ; }@@ -452,7 +452,7 @@ static int smi_port_irq(struct smi_port *port, u32 int_status)smi_port_disableInterrupt (port); port->_int_status = int_status;smi_port_clearInterrupt (port); -tasklet_schedule (&port->tasklet); +queue_work (system_bh_wq, &port->work); handled =1 ; }return handled;@@ -823,7 +823,7 @@ static int smi_start_feed(struct dvb_demux_feed *dvbdmxfeed)smi_port_clearInterrupt (port);smi_port_enableInterrupt (port);smi_write (port->DMA_MANAGEMENT, dmaManagement); -tasklet_enable (&port->tasklet); +enable_and_queue_work (system_bh_wq, &port->work); }return port->users; }@@ -837,7 +837,7 @@ static int smi_stop_feed(struct dvb_demux_feed *dvbdmxfeed)if (--port->users)return port->users; -tasklet_disable (&port->tasklet); +disable_work_sync (&port->work);smi_port_disableInterrupt (port);smi_clear (port->DMA_MANAGEMENT,0x30003 );return 0 ;drivers/media/pci/smipcie/smipcie.h +2
-1@@ -17,6 +17,7 @@#include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/slab.h> +#include <linux/workqueue.h> #include <media/rc-core.h> #include <media/demux.h> @@ -257,7 +258,7 @@ struct smi_port {u32 _dmaInterruptCH0;u32 _dmaInterruptCH1;u32 _int_status; -struct tasklet_struct tasklet; +struct work_struct work;/* dvb */ struct dmx_frontend hw_frontend;struct dmx_frontend mem_frontend;drivers/media/pci/ttpci/budget-av.c +2
-1@@ -37,6 +37,7 @@#include <linux/interrupt.h> #include <linux/input.h> #include <linux/spinlock.h> +#include <linux/workqueue.h> #include <media/dvb_ca_en50221.h> @@ -55,7 +56,7 @@ struct budget_av {struct video_device vd;int cur_input;int has_saa7113; -struct tasklet_struct ciintf_irq_tasklet; +struct work_struct ciintf_irq_work;int slot_status;struct dvb_ca_en50221 ca; u8 reinitialise_demod:1;drivers/media/pci/ttpci/budget-ci.c +14
-13@@ -17,6 +17,7 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/spinlock.h> +#include <linux/workqueue.h> #include <media/rc-core.h> #include "budget.h" @@ -80,7 +81,7 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);struct budget_ci_ir {struct rc_dev *dev; -struct tasklet_struct msp430_irq_tasklet; +struct work_struct msp430_irq_work;char name[72 ];/* 40 + 32 for (struct saa7146_dev).name */ char phys[32 ];int rc5_device;@@ -91,7 +92,7 @@ struct budget_ci_ir {struct budget_ci {struct budget budget; -struct tasklet_struct ciintf_irq_tasklet; +struct work_struct ciintf_irq_work;int slot_status;int ci_irq;struct dvb_ca_en50221 ca;@@ -99,9 +100,9 @@ struct budget_ci {u8 tuner_pll_address;/* used for philips_tdm1316l configs */ }; -static void msp430_ir_interrupt (struct tasklet_struct *t) +static void msp430_ir_interrupt (struct work_struct *t) { -struct budget_ci_ir *ir =from_tasklet (ir, t, msp430_irq_tasklet); +struct budget_ci_ir *ir =from_work (ir, t, msp430_irq_work);struct budget_ci *budget_ci =container_of (ir,typeof (*budget_ci), ir);struct rc_dev *dev = budget_ci->ir.dev;u32 command =ttpci_budget_debiread (&budget_ci->budget,DEBINOSWAP ,DEBIADDR_IR ,2 ,1 ,0 ) >>8 ;@@ -230,7 +231,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) budget_ci->ir.dev = dev; -tasklet_setup (&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt); +INIT_WORK (&budget_ci->ir.msp430_irq_work, msp430_ir_interrupt);SAA7146_IER_ENABLE (saa,MASK_06 );saa7146_setgpio (saa,3 ,SAA7146_GPIO_IRQHI );@@ -244,7 +245,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci)SAA7146_IER_DISABLE (saa,MASK_06 );saa7146_setgpio (saa,3 ,SAA7146_GPIO_INPUT ); -tasklet_kill (&budget_ci->ir.msp430_irq_tasklet); +cancel_work_sync (&budget_ci->ir.msp430_irq_work);rc_unregister_device (budget_ci->ir.dev); }@@ -348,10 +349,10 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot)return 0 ; } -static void ciintf_interrupt (struct tasklet_struct *t) +static void ciintf_interrupt (struct work_struct *t) { -struct budget_ci *budget_ci =from_tasklet (budget_ci, t, - ciintf_irq_tasklet); +struct budget_ci *budget_ci =from_work (budget_ci, t, + ciintf_irq_work);struct saa7146_dev *saa = budget_ci->budget.dev;unsigned int flags;@@ -492,7 +493,7 @@ static int ciintf_init(struct budget_ci *budget_ci)// Setup CI slot IRQ if (budget_ci->ci_irq) { -tasklet_setup (&budget_ci->ciintf_irq_tasklet, ciintf_interrupt); +INIT_WORK (&budget_ci->ciintf_irq_work, ciintf_interrupt);if (budget_ci->slot_status !=SLOTSTATUS_NONE ) {saa7146_setgpio (saa,0 ,SAA7146_GPIO_IRQLO ); }else {@@ -532,7 +533,7 @@ static void ciintf_deinit(struct budget_ci *budget_ci)if (budget_ci->ci_irq) {SAA7146_IER_DISABLE (saa,MASK_03 );saa7146_setgpio (saa,0 ,SAA7146_GPIO_INPUT ); -tasklet_kill (&budget_ci->ciintf_irq_tasklet); +cancel_work_sync (&budget_ci->ciintf_irq_work); }// reset interface @@ -558,13 +559,13 @@ static void budget_ci_irq(struct saa7146_dev *dev, u32 * isr)dprintk (8 ,"dev: %p, budget_ci: %p\n" , dev, budget_ci);if (*isr &MASK_06 ) -tasklet_schedule (&budget_ci->ir.msp430_irq_tasklet); +queue_work (system_bh_wq, &budget_ci->ir.msp430_irq_work);if (*isr &MASK_10 )ttpci_budget_irq10_handler (dev, isr);if ((*isr &MASK_03 ) && (budget_ci->budget.ci_present) && (budget_ci->ci_irq)) -tasklet_schedule (&budget_ci->ciintf_irq_tasklet); +queue_work (system_bh_wq, &budget_ci->ciintf_irq_work); }static u8 philips_su1278_tt_inittab[] = {drivers/media/pci/ttpci/budget-core.c +5
-5@@ -171,9 +171,9 @@ static int budget_read_fe_status(struct dvb_frontend *fe,return ret; } -static void vpeirq (struct tasklet_struct *t) +static void vpeirq (struct work_struct *t) { -struct budget *budget =from_tasklet (budget, t, vpe_tasklet); +struct budget *budget =from_work (budget, t, vpe_work);u8 *mem = (u8 *) (budget->grabbing);u32 olddma = budget->ttbp;u32 newdma =saa7146_read (budget->dev,PCI_VDP3 );@@ -520,7 +520,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,/* upload all */ saa7146_write (dev,GPIO_CTRL ,0x000000 ); -tasklet_setup (&budget->vpe_tasklet, vpeirq); +INIT_WORK (&budget->vpe_work, vpeirq);/* frontend power on */ if (bi->type !=BUDGET_FS_ACTIVY )@@ -557,7 +557,7 @@ int ttpci_budget_deinit(struct budget *budget)budget_unregister (budget); -tasklet_kill (&budget->vpe_tasklet); +cancel_work_sync (&budget->vpe_work);saa7146_vfree_destroy_pgtable (dev->pci, budget->grabbing, &budget->pt);@@ -575,7 +575,7 @@ void ttpci_budget_irq10_handler(struct saa7146_dev *dev, u32 * isr)dprintk (8 ,"dev: %p, budget: %p\n" , dev, budget);if (*isr &MASK_10 ) -tasklet_schedule (&budget->vpe_tasklet); +queue_work (system_bh_wq, &budget->vpe_work); }void ttpci_budget_set_video_port (struct saa7146_dev *dev,int video_port)drivers/media/pci/ttpci/budget.h +3
-2@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <media/drv-intf/saa7146.h> @@ -49,8 +50,8 @@ struct budget {unsigned char *grabbing;struct saa7146_pgtable pt; -struct tasklet_struct fidb_tasklet; -struct tasklet_struct vpe_tasklet; +struct work_struct fidb_work; +struct work_struct vpe_work;struct dmxdev dmxdev;struct dvb_demux demux;drivers/media/pci/tw5864/tw5864-core.c +1
-1@@ -144,7 +144,7 @@ static void tw5864_h264_isr(struct tw5864_dev *dev) cur_frame->gop_seqno = input->frame_gop_seqno; dev->h264_buf_w_index = next_frame_index; -tasklet_schedule (&dev->tasklet); +queue_work (system_bh_wq, &dev->work); cur_frame = next_frame;drivers/media/pci/tw5864/tw5864-video.c +1
-0@@ -6,6 +6,7 @@*/ #include <linux/module.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-event.h> #include <media/videobuf2-dma-contig.h> drivers/media/pci/tw5864/tw5864-video.c static const unsigned int intra4x4_lambda3[] = { · line 179
Quoted 5 lines
drivers/media/pci/tw5864/tw5864-video.c +1
-1@@ -175,7 +176,7 @@ static const unsigned int intra4x4_lambda3[] = {static v4l2_std_id tw5864_get_v4l2_std (enum tw5864_vid_std std);static enum tw5864_vid_std tw5864_from_v4l2_std (v4l2_std_id v4l2_std); -static void tw5864_handle_frame_task (struct tasklet_struct *t); +static void tw5864_handle_frame_task (struct work_struct *t);I think
_taskshould be renamed to_work.Quoted 96 lines
drivers/media/pci/tw5864/tw5864-video.c +2
-2static void tw5864_handle_frame (struct tw5864_h264_frame *frame);static void tw5864_frame_interval_set (struct tw5864_input *input);@@ -1062,7 +1063,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr) dev->irqmask |=TW5864_INTR_VLC_DONE |TW5864_INTR_TIMER ;tw5864_irqmask_apply (dev); -tasklet_setup (&dev->tasklet, tw5864_handle_frame_task); +INIT_WORK (&dev->work, tw5864_handle_frame_task);for (i =0 ; i <TW5864_INPUTS ; i++) { dev->inputs[i].root = dev;@@ -1079,7 +1080,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr)for (i = last_input_nr_registered; i >=0 ; i--)tw5864_video_input_fini (&dev->inputs[i]); -tasklet_kill (&dev->tasklet); +cancel_work_sync (&dev->work);
free_dma:for (i = last_dma_allocated; i >= 0; i--) {drivers/media/pci/tw5864/tw5864-video.c +3
-3@@ -1198,7 +1199,7 @@ void tw5864_video_fini(struct tw5864_dev *dev) {int i; -tasklet_kill (&dev->tasklet); +cancel_work_sync (&dev->work);for (i =0 ; i <TW5864_INPUTS ; i++)tw5864_video_input_fini (&dev->inputs[i]);@@ -1315,9 +1316,9 @@ static int tw5864_is_motion_triggered(struct tw5864_h264_frame *frame)return detected; } -static void tw5864_handle_frame_task (struct tasklet_struct *t) +static void tw5864_handle_frame_task (struct work_struct *t) { -struct tw5864_dev *dev =from_tasklet (dev, t, tasklet); +struct tw5864_dev *dev =from_work (dev, t, work);unsigned long flags;int batch_size =H264_BUF_CNT ;drivers/media/pci/tw5864/tw5864.h +4
-3@@ -12,6 +12,7 @@#include <linux/mutex.h> #include <linux/io.h> #include <linux/interrupt.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> @@ -85,7 +86,7 @@ struct tw5864_input {int nr;/* input number */ struct tw5864_dev *root;struct mutex lock;/* used for vidq and vdev */ -spinlock_t slock;/* used for sync between ISR, tasklet & V4L2 API */ +spinlock_t slock;/* used for sync between ISR, work & V4L2 API */ struct video_device vdev;struct v4l2_ctrl_handler hdl;struct vb2_queue vidq;@@ -142,7 +143,7 @@ struct tw5864_h264_frame {/* global device status */ struct tw5864_dev { -spinlock_t slock;/* used for sync between ISR, tasklet & V4L2 API */ +spinlock_t slock;/* used for sync between ISR, work & V4L2 API */ struct v4l2_device v4l2_dev;struct tw5864_input inputs[TW5864_INPUTS ];#define H264_BUF_CNT 4@@ -150,7 +151,7 @@ struct tw5864_dev {int h264_buf_r_index;int h264_buf_w_index; -struct tasklet_struct tasklet; +struct work_struct work;int encoder_busy;/* Input number to check next for ready raw picture (in RR fashion) */ drivers/media/platform/intel/pxa_camera.c +1
-0@@ -43,6 +43,7 @@#include <linux/videodev2.h> #include <linux/platform_data/media/camera-pxa.h> +#include <linux/workqueue.h> #define PXA_CAM_VERSION "0.0.6"#define PXA_CAM_DRV_NAME "pxa27x-camera"@@ -683,7 +684,7 @@ struct pxa_camera_dev {unsigned int buf_sequence;
Quoted 5 lines
drivers/media/platform/intel/pxa_camera.c struct pxa_camera_dev { · line 687
Quoted 3 lines
drivers/media/platform/intel/pxa_camera.c +1
-1struct pxa_buffer *active; -struct tasklet_struct task_eof; +struct work_struct task_eof;This should be renamed to
eof_bh_workfor consistency.
Will do.
Quoted 79 lines
Quoted 79 lines
drivers/media/platform/intel/pxa_camera.c +4
-4u32 save_cicr[5 ]; };@@ -1146,9 +1147,9 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)clk_disable_unprepare (pcdev->clk); } -static void pxa_camera_eof (struct tasklet_struct *t) +static void pxa_camera_eof (struct work_struct *t) { -struct pxa_camera_dev *pcdev =from_tasklet (pcdev, t, task_eof); +struct pxa_camera_dev *pcdev =from_work (pcdev, t, task_eof);unsigned long cifr;struct pxa_buffer *buf;@@ -1185,7 +1186,7 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)if (status &CISR_EOF ) { cicr0 =__raw_readl (pcdev->base +CICR0 ) |CICR0_EOFM ;__raw_writel (cicr0, pcdev->base +CICR0 ); -tasklet_schedule (&pcdev->task_eof); +queue_work (system_bh_wq, &pcdev->task_eof); }return IRQ_HANDLED ;@@ -2383,7 +2384,7 @@ static int pxa_camera_probe(struct platform_device *pdev) } } -tasklet_setup (&pcdev->task_eof, pxa_camera_eof); +INIT_WORK (&pcdev->task_eof, pxa_camera_eof);pxa_camera_activate (pcdev);@@ -2409,7 +2410,7 @@ static int pxa_camera_probe(struct platform_device *pdev)return 0 ;
exit_deactivate:pxa_camera_deactivate(pcdev);drivers/media/platform/intel/pxa_camera.c +1
-1-tasklet_kill (&pcdev->task_eof); +cancel_work_sync (&pcdev->task_eof);
exit_free_dma:dma_release_channel(pcdev->dma_chans[2]);
exit_free_dma_u:drivers/media/platform/intel/pxa_camera.c +1
-1@@ -2428,7 +2429,7 @@ static void pxa_camera_remove(struct platform_device *pdev)struct pxa_camera_dev *pcdev =platform_get_drvdata (pdev);pxa_camera_deactivate (pcdev); -tasklet_kill (&pcdev->task_eof); +cancel_work_sync (&pcdev->task_eof);dma_release_channel (pcdev->dma_chans[0 ]);dma_release_channel (pcdev->dma_chans[1 ]);dma_release_channel (pcdev->dma_chans[2 ]);drivers/media/platform/marvell/mcam-core.c +3
-2@@ -25,6 +25,7 @@#include <linux/clk-provider.h> #include <linux/videodev2.h> #include <linux/pm_runtime.h> +#include <linux/workqueue.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-ctrls.h> @@ -439,9 +440,9 @@ static void mcam_ctlr_dma_vmalloc(struct mcam_camera *cam)/* * Copy data out to user space in the vmalloc case */ -static void mcam_frame_tasklet (struct tasklet_struct *t) +static void mcam_frame_work (struct work_struct *t) { -struct mcam_camera *cam =from_tasklet (cam, t, s_tasklet); +struct mcam_camera *cam =from_work (cam, t, s_work);int i;unsigned long flags;struct mcam_vb_buffer *buf;@@ -480,7 +481,7 @@ static void mcam_frame_tasklet(struct tasklet_struct *t)
Quoted 6 lines
drivers/media/platform/marvell/mcam-core.c static void mcam_frame_tasklet(struct tasklet_struct *t) · line 484
Quoted 3 lines
drivers/media/platform/marvell/mcam-core.c +1
-1/* -* Make sure our allocated buffers are up to the task. +* Make sure our allocated buffers are up to the work. Drop this change: "up to the task" is an English expression, it doesn't refer to a tasklet :-)
Will have it removed.
Quoted 132 lines
Quoted 132 lines
drivers/media/platform/marvell/mcam-core.c +2
-2*/ static int mcam_check_dma_buffers (struct mcam_camera *cam) {@@ -493,7 +494,7 @@ static int mcam_check_dma_buffers(struct mcam_camera *cam)static void mcam_vmalloc_done (struct mcam_camera *cam,int frame) { -tasklet_schedule (&cam->s_tasklet); +queue_work (system_bh_wq, &cam->s_work); }#else /* MCAM_MODE_VMALLOC */ @@ -1305,7 +1306,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam)break ;case B_vmalloc:#ifdef MCAM_MODE_VMALLOC -tasklet_setup (&cam->s_tasklet, mcam_frame_tasklet); +INIT_WORK (&cam->s_work, mcam_frame_work); vq->ops = &mcam_vb2_ops; vq->mem_ops = &vb2_vmalloc_memops; cam->dma_setup = mcam_ctlr_dma_vmalloc;drivers/media/platform/marvell/mcam-core.h +2
-1@@ -9,6 +9,7 @@#include <linux/list.h> #include <linux/clk-provider.h> +#include <linux/workqueue.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-dev.h> @@ -167,7 +168,7 @@ struct mcam_camera {unsigned int dma_buf_size;/* allocated size */ void *dma_bufs[MAX_DMA_BUFS ];/* Internal buffer addresses */ dma_addr_t dma_handles[MAX_DMA_BUFS ];/* Buffer bus addresses */ -struct tasklet_struct s_tasklet; +struct work_struct s_work;#endif unsigned int sequence;/* Frame sequence number */ unsigned int buf_seq[MAX_DMA_BUFS ];/* Sequence for individual bufs */ drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.c +8
-7@@ -33,6 +33,7 @@#include <linux/time.h> #include <linux/usb.h> #include <linux/wait.h> +#include <linux/workqueue.h> #include "c8sectpfe-common.h" #include "c8sectpfe-core.h" @@ -73,16 +74,16 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t)/* is this descriptor initialised and TP enabled */ if (channel->irec &&readl (channel->irec +DMA_PRDS_TPENABLE )) -tasklet_schedule (&channel->tsklet); +queue_work (system_bh_wq, &channel->work); } fei->timer.expires = jiffies +msecs_to_jiffies (POLL_MSECS );add_timer (&fei->timer); } -static void channel_swdemux_tsklet (struct tasklet_struct *t) +static void channel_swdemux_work (struct work_struct *t) { -struct channel_info *channel =from_tasklet (channel, t, tsklet); +struct channel_info *channel =from_work (channel, t, work);struct c8sectpfei *fei;unsigned long wp, rp;int pos, num_packets, n, size;@@ -211,7 +212,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed)dev_dbg (fei->dev,"Starting channel=%p\n" , channel); -tasklet_setup (&channel->tsklet, channel_swdemux_tsklet); +INIT_WORK (&channel->work, channel_swdemux_work);/* Reset the internal inputblock sram pointers */ writel(channel->fifo,@@ -304,7 +305,7 @@ static int c8sectpfe_stop_feed(struct dvb_demux_feed *dvbdmxfeed)/* disable this channels descriptor */ writel (0 , channel->irec +DMA_PRDS_TPENABLE ); -tasklet_disable (&channel->tsklet); +disable_work_sync (&channel->work);/* now request memdma channel goes idle */ idlereq = (1 << channel->tsin_id) |IDLEREQ ;@@ -631,8 +632,8 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei,writel (tsin->back_buffer_busaddr, tsin->irec +DMA_PRDS_BUSWP_TP (0 ));writel (tsin->back_buffer_busaddr, tsin->irec +DMA_PRDS_BUSRP_TP (0 )); -/* initialize tasklet */ -tasklet_setup (&tsin->tsklet, channel_swdemux_tsklet); +/* initialize work */ +INIT_WORK (&tsin->work, channel_swdemux_work);return 0 ;drivers/media/platform/st/sti/c8sectpfe/c8sectpfe-core.h +1
-1@@ -51,7 +51,7 @@ struct channel_info {unsigned long fifo;struct completion idle_completion; -struct tasklet_struct tsklet; +struct work_struct work;struct c8sectpfei *fei;void __iomem *irec;drivers/media/radio/wl128x/fmdrv.h +1
-0@@ -15,6 +15,7 @@#include <sound/core.h> #include <sound/initval.h> #include <linux/timer.h> +#include <linux/workqueue.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h> @@ -200,15 +201,15 @@ struct fmdev {int streg_cbdata;/* status of ST registration */
Quoted 5 lines
drivers/media/radio/wl128x/fmdrv.h struct fmdev { · line 204
Quoted 3 lines
drivers/media/radio/wl128x/fmdrv.h +1
-1struct sk_buff_head rx_q;/* RX queue */ -struct tasklet_struct rx_task;/* RX Tasklet */ +struct work_struct rx_task;/* RX Work */ Rename to
rx_bh_work
Will do.
Quoted 7 lines
drivers/media/radio/wl128x/fmdrv.h struct fmdev { · line 207
Quoted 5 lines
drivers/media/radio/wl128x/fmdrv.h +1
-1struct sk_buff_head tx_q;/* TX queue */ -struct tasklet_struct tx_task;/* TX Tasklet */ +struct work_struct tx_task;/* TX Work */ Ditto.
Sure.
Quoted 260 lines
Quoted 249 lines
drivers/media/radio/wl128x/fmdrv.h +1
-1unsigned long last_tx_jiffies;/* Timestamp of last pkt sent */ atomic_t tx_cnt;/* Number of packets can send at a time */ struct sk_buff *resp_skb;/* Response from the chip */ -/* Main task completion handler */ +/* Main work completion handler */ struct completion maintask_comp;/* Opcode of last command sent to the chip */ u8 pre_op;drivers/media/radio/wl128x/fmdrv_common.c +21
-20@@ -9,7 +9,7 @@* one Channel-8 command to be sent to the chip). * 2) Sending each Channel-8 command to the chip and reading * response back over Shared Transport. -* 3) Managing TX and RX Queues and Tasklets. +* 3) Managing TX and RX Queues and Work. * 4) Handling FM Interrupt packet and taking appropriate action. * 5) Loading FM firmware to the chip (common, FM TX, and FM RX * firmware files based on mode selection) @@ -29,6 +29,7 @@#include "fmdrv_v4l2.h" #include "fmdrv_common.h" #include <linux/ti_wilink_st.h> +#include <linux/workqueue.h> #include "fmdrv_rx.h" #include "fmdrv_tx.h" @@ -244,10 +245,10 @@ void fmc_update_region_info(struct fmdev *fmdev, u8 region_to_set) }/* -* FM common sub-module will schedule this tasklet whenever it receives +* FM common sub-module will queue this work whenever it receives * FM packet from ST driver. */ -static void recv_tasklet (struct tasklet_struct *t) +static void recv_work (struct work_struct *t) {struct fmdev *fmdev;struct fm_irq *irq_info;@@ -256,7 +257,7 @@ static void recv_tasklet(struct tasklet_struct *t)u8 num_fm_hci_cmds;unsigned long flags; - fmdev =from_tasklet (fmdev, t, tx_task); + fmdev =from_work (fmdev, t, tx_task); irq_info = &fmdev->irq_info;/* Process all packets in the RX queue */ while ((skb =skb_dequeue (&fmdev->rx_q))) {@@ -322,22 +323,22 @@ static void recv_tasklet(struct tasklet_struct *t)/* * Check flow control field. If Num_FM_HCI_Commands field is -* not zero, schedule FM TX tasklet. +* not zero, queue FM TX work. */ if (num_fm_hci_cmds &&atomic_read (&fmdev->tx_cnt))if (!skb_queue_empty (&fmdev->tx_q)) -tasklet_schedule (&fmdev->tx_task); +queue_work (system_bh_wq, &fmdev->tx_task); } } -/* FM send tasklet: is scheduled when FM packet has to be sent to chip */ -static void send_tasklet (struct tasklet_struct *t) +/* FM send work: is scheduled when FM packet has to be sent to chip */ +static void send_work (struct work_struct *t) {struct fmdev *fmdev;struct sk_buff *skb;int len; - fmdev =from_tasklet (fmdev, t, tx_task); + fmdev =from_work (fmdev, t, tx_task);if (!atomic_read (&fmdev->tx_cnt))return ;@@ -366,7 +367,7 @@ static void send_tasklet(struct tasklet_struct *t)if (len <0 ) {kfree_skb (skb); fmdev->resp_comp =NULL ; -fmerr ("TX tasklet failed to send skb(%p)\n" , skb); +fmerr ("TX work failed to send skb(%p)\n" , skb);atomic_set (&fmdev->tx_cnt,1 ); }else { fmdev->last_tx_jiffies = jiffies;@@ -374,7 +375,7 @@ static void send_tasklet(struct tasklet_struct *t) }/* -* Queues FM Channel-8 packet to FM TX queue and schedules FM TX tasklet for +* Queues FM Channel-8 packet to FM TX queue and schedules FM TX work for * transmission */ static int fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,@@ -440,7 +441,7 @@ static int fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,fm_cb (skb)->completion = wait_completion;skb_queue_tail (&fmdev->tx_q, skb); -tasklet_schedule (&fmdev->tx_task); +queue_work (system_bh_wq, &fmdev->tx_task);return 0 ; }@@ -462,7 +463,7 @@ int fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,if (!wait_for_completion_timeout (&fmdev->maintask_comp,FM_DRV_TX_TIMEOUT )) { -fmerr ("Timeout(%d sec),didn't get regcompletion signal from RX tasklet\n" , +fmerr ("Timeout(%d sec),didn't get regcompletion signal from RX work\n" ,jiffies_to_msecs (FM_DRV_TX_TIMEOUT ) /1000 );return -ETIMEDOUT ; }@@ -1455,7 +1456,7 @@ static long fm_st_receive(void *arg, struct sk_buff *skb)memcpy (skb_push (skb,1 ), &skb->cb[0 ],1 );skb_queue_tail (&fmdev->rx_q, skb); -tasklet_schedule (&fmdev->rx_task); +queue_work (system_bh_wq, &fmdev->rx_task);return 0 ; }@@ -1537,13 +1538,13 @@ int fmc_prepare(struct fmdev *fmdev)spin_lock_init (&fmdev->rds_buff_lock);spin_lock_init (&fmdev->resp_skb_lock); -/* Initialize TX queue and TX tasklet */ +/* Initialize TX queue and TX work */ skb_queue_head_init (&fmdev->tx_q); -tasklet_setup (&fmdev->tx_task, send_tasklet); +INIT_WORK (&fmdev->tx_task, send_work); -/* Initialize RX Queue and RX tasklet */ +/* Initialize RX Queue and RX work */ skb_queue_head_init (&fmdev->rx_q); -tasklet_setup (&fmdev->rx_task, recv_tasklet); +INIT_WORK (&fmdev->rx_task, recv_work); fmdev->irq_info.stage =0 ;atomic_set (&fmdev->tx_cnt,1 );@@ -1589,8 +1590,8 @@ int fmc_release(struct fmdev *fmdev)/* Service pending read */ wake_up_interruptible (&fmdev->rx.rds.read_queue); -tasklet_kill (&fmdev->tx_task); -tasklet_kill (&fmdev->rx_task); +cancel_work_sync (&fmdev->tx_task); +cancel_work_sync (&fmdev->rx_task);skb_queue_purge (&fmdev->tx_q);skb_queue_purge (&fmdev->rx_q);drivers/media/rc/mceusb.c +1
-1@@ -774,7 +774,7 @@ static void mceusb_dev_printdata(struct mceusb_dev *ir, u8 *buf, int buf_len,/* * Schedule work that can't be done in interrupt handlers -* (mceusb_dev_recv() and mce_write_callback()) nor tasklets. +* (mceusb_dev_recv() and mce_write_callback()) nor works. * Invokes mceusb_deferred_kevent() for recovering from * error events specified by the kevent bit field. */ drivers/media/usb/ttusb-dec/ttusb_dec.c +10
-9@@ -19,6 +19,7 @@#include <linux/input.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> #include <media/dvb_demux.h> @@ -139,7 +140,7 @@ struct ttusb_dec {int v_pes_postbytes;struct list_head urb_frame_list; -struct tasklet_struct urb_tasklet; +struct work_struct urb_work;spinlock_t urb_frame_list_lock;struct dvb_demux_filter *audio_filter;@@ -766,9 +767,9 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, } } -static void ttusb_dec_process_urb_frame_list (struct tasklet_struct *t) +static void ttusb_dec_process_urb_frame_list (struct work_struct *t) { -struct ttusb_dec *dec =from_tasklet (dec, t, urb_tasklet); +struct ttusb_dec *dec =from_work (dec, t, urb_work);struct list_head *item;struct urb_frame *frame;unsigned long flags;@@ -822,7 +823,7 @@ static void ttusb_dec_process_urb(struct urb *urb)spin_unlock_irqrestore (&dec->urb_frame_list_lock, flags); -tasklet_schedule (&dec->urb_tasklet); +queue_work (system_bh_wq, &dec->urb_work); } } }else {@@ -1198,11 +1199,11 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec)return 0 ; } -static void ttusb_dec_init_tasklet (struct ttusb_dec *dec) +static void ttusb_dec_init_work (struct ttusb_dec *dec) {spin_lock_init (&dec->urb_frame_list_lock);INIT_LIST_HEAD (&dec->urb_frame_list); -tasklet_setup (&dec->urb_tasklet, ttusb_dec_process_urb_frame_list); +INIT_WORK (&dec->urb_work, ttusb_dec_process_urb_frame_list); }static int ttusb_init_rc (struct ttusb_dec *dec)@@ -1588,12 +1589,12 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec)ttusb_dec_free_iso_urbs (dec); } -static void ttusb_dec_exit_tasklet (struct ttusb_dec *dec) +static void ttusb_dec_exit_work (struct ttusb_dec *dec) {struct list_head *item;struct urb_frame *frame; -tasklet_kill (&dec->urb_tasklet); +cancel_work_sync (&dec->urb_work);while ((item = dec->urb_frame_list.next) != &dec->urb_frame_list) { frame = list_entry(item, struct urb_frame, urb_frame_list);@@ -1703,7 +1704,7 @@ static int ttusb_dec_probe(struct usb_interface *intf,ttusb_dec_init_v_pes (dec);ttusb_dec_init_filters (dec); -ttusb_dec_init_tasklet (dec); +ttusb_dec_init_work (dec); dec->active =1 ;drivers/media/usb/ttusb-dec/ttusb_dec.c static void ttusb_dec_disconnect(struct usb_interface *intf) · line 1736
Quoted 8 lines
drivers/media/usb/ttusb-dec/ttusb_dec.c +1
-1@@ -1729,7 +1730,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf)dprintk ("%s\n" , __func__);if (dec->active) { -ttusb_dec_exit_tasklet (dec); +ttusb_dec_exit_work (dec);ttusb_dec_exit_filters (dec);if (enable_rc)ttusb_dec_exit_rc (dec);Regards,
Quoted 1 line
Hans
Thank you very much for taking the time to review the patch. Will have it all Addressed in the next version.
- Allen