Subject: [PATCH] use the new request_module_nowait() in drivers/media From: Arjan van de Ven Several drivers/media/video drivers use keventd to load modules to avoid the "load a module from the module init code" deadlock. Now that we have request_module_nowait() this can be simplified greatly. Signed-off-by: Arjan van de Ven Signed-off-by: Rusty Russell Acked-by: Mauro Carvalho Chehab --- drivers/media/video/bt8xx/bttv-driver.c | 8 +------- drivers/media/video/bt8xx/bttvp.h | 3 --- drivers/media/video/cx88/cx88-mpeg.c | 16 ++++------------ drivers/media/video/cx88/cx88.h | 1 - drivers/media/video/em28xx/em28xx-cards.c | 17 ++++------------- drivers/media/video/em28xx/em28xx.h | 2 -- drivers/media/video/saa7134/saa7134-core.c | 23 ++++++++--------------- drivers/media/video/saa7134/saa7134.h | 2 -- 8 files changed, 17 insertions(+), 55 deletions(-) diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c @@ -175,15 +175,9 @@ static DEVICE_ATTR(card, S_IRUGO, show_c /* ----------------------------------------------------------------------- */ /* dvb auto-load setup */ #if defined(CONFIG_MODULES) && defined(MODULE) -static void request_module_async(struct work_struct *work) -{ - request_module("dvb-bt8xx"); -} - static void request_modules(struct bttv *dev) { - INIT_WORK(&dev->request_module_wk, request_module_async); - schedule_work(&dev->request_module_wk); + request_module_nowait("dvb-bt8xx"); } #else #define request_modules(dev) diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h @@ -439,9 +439,6 @@ struct bttv { unsigned int users; struct bttv_fh init; - /* used to make dvb-bt8xx autoloadable */ - struct work_struct request_module_wk; - /* Default (0) and current (1) video capturing and overlay cropping parameters in bttv_tvnorm.cropcap units. Protected by bttv.lock. */ diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c @@ -50,20 +50,12 @@ MODULE_PARM_DESC(debug,"enable debug mes printk(KERN_DEBUG "%s/2-mpeg: " fmt, core->name, ## arg) #if defined(CONFIG_MODULES) && defined(MODULE) -static void request_module_async(struct work_struct *work) -{ - struct cx8802_dev *dev=container_of(work, struct cx8802_dev, request_module_wk); - - if (dev->core->board.mpeg & CX88_MPEG_DVB) - request_module("cx88-dvb"); - if (dev->core->board.mpeg & CX88_MPEG_BLACKBIRD) - request_module("cx88-blackbird"); -} - static void request_modules(struct cx8802_dev *dev) { - INIT_WORK(&dev->request_module_wk, request_module_async); - schedule_work(&dev->request_module_wk); + if (dev->core->board.mpeg & CX88_MPEG_DVB) + request_module_nowait("cx88-dvb"); + if (dev->core->board.mpeg & CX88_MPEG_BLACKBIRD) + request_module_nowait("cx88-blackbird"); } #else #define request_modules(dev) diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h @@ -510,7 +510,6 @@ struct cx8802_dev { /* List of attached drivers */ struct list_head drvlist; - struct work_struct request_module_wk; }; /* ----------------------------------------------------------- */ diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -1809,24 +1809,15 @@ void em28xx_card_setup(struct em28xx *de #if defined(CONFIG_MODULES) && defined(MODULE) -static void request_module_async(struct work_struct *work) +static void request_modules(struct em28xx *dev) { - struct em28xx *dev = container_of(work, - struct em28xx, request_module_wk); - if (dev->has_audio_class) - request_module("snd-usb-audio"); + request_module_nowait("snd-usb-audio"); else if (dev->has_alsa_audio) - request_module("em28xx-alsa"); + request_module_nowait("em28xx-alsa"); if (dev->board.has_dvb) - request_module("em28xx-dvb"); -} - -static void request_modules(struct em28xx *dev) -{ - INIT_WORK(&dev->request_module_wk, request_module_async); - schedule_work(&dev->request_module_wk); + request_module_nowait("em28xx-dvb"); } #else #define request_modules(dev) diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h --- a/drivers/media/video/em28xx/em28xx.h +++ b/drivers/media/video/em28xx/em28xx.h @@ -498,8 +498,6 @@ struct em28xx { enum em28xx_dev_state state; enum em28xx_io_method io; - struct work_struct request_module_wk; - /* locks */ struct mutex lock; struct mutex ctrl_urb_lock; /* protects urb_buf */ diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c @@ -149,23 +149,16 @@ void saa7134_set_gpio(struct saa7134_dev /* delayed request_module */ #if defined(CONFIG_MODULES) && defined(MODULE) - -static void request_module_async(struct work_struct *work){ - struct saa7134_dev* dev = container_of(work, struct saa7134_dev, request_module_wk); - if (card_is_empress(dev)) - request_module("saa7134-empress"); - if (card_is_dvb(dev)) - request_module("saa7134-dvb"); - if (alsa) - request_module("saa7134-alsa"); - if (oss) - request_module("saa7134-oss"); -} - static void request_submodules(struct saa7134_dev *dev) { - INIT_WORK(&dev->request_module_wk, request_module_async); - schedule_work(&dev->request_module_wk); + if (card_is_empress(dev)) + request_module_nowait("saa7134-empress"); + if (card_is_dvb(dev)) + request_module_nowait("saa7134-dvb"); + if (alsa) + request_module_nowait("saa7134-alsa"); + if (oss) + request_module_nowait("saa7134-oss"); } #else diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h @@ -482,8 +482,6 @@ struct saa7134_dev { struct mutex lock; spinlock_t slock; struct v4l2_prio_state prio; - /* workstruct for loading modules */ - struct work_struct request_module_wk; /* insmod option/autodetected */ int autodetected;