remove CONFIG_KMOD from drivers
Subsystems (6)
Network drivers Media (V4L/DVB) Memory technology devices (MTD) Framebuffer layer +2 more subsystems
PATCH 1/5 remove CONFIG_KMOD from drivers
From: Johannes Berg <[email protected]>
Straight forward conversions to CONFIG_MODULE; many drivers include <linux/kmod.h> conditionally and then don't have any other conditional code so remove it from those.
Signed-off-by Johannes Berg <[email protected]>
Cc David Woodhouse <[email protected]>
Signed-off-by Rusty Russell <[email protected]>
--- drivers/md/md.c | 7 ------- drivers/media/video/cpia.c | 4 ---- drivers/media/video/usbvision/usbvision-core.c | 4 ---- drivers/media/video/usbvision/usbvision-video.c | 4 ---- drivers/media/video/v4l1-compat.c | 4 ---- drivers/media/video/v4l2-common.c | 4 ---- drivers/media/video/vino.c | 5 +---- drivers/media/video/w9968cf.c | 4 ++-- drivers/mtd/mtdpart.c | 2 -- drivers/net/irda/sir_dongle.c | 2 -- drivers/net/ppp_generic.c | 10 +++------- drivers/net/pppox.c | 9 ++------- drivers/video/fbmem.c | 17 ++--------------- 13 files changed, 10 insertions(+), 66 deletions(-)
drivers/md/md.c +0 -7
@@ -44,14 +44,9 @@#include <linux/mutex.h> #include <linux/ctype.h> #include <linux/freezer.h> -#include <linux/init.h> -#include <linux/file.h> - -#ifdef CONFIG_KMOD #include <linux/kmod.h> -#endif #include <asm/unaligned.h>
@@ -3558,12 +3553,10 @@ static int do_md_run(mddev_t * mddev) } } -#ifdef CONFIG_KMOD if (mddev->level !=LEVEL_NONE )request_module ("md-level-%d" , mddev->level);else if (mddev->clevel[0 ])request_module ("md-%s" , mddev->clevel); -#endif /* * Drop all container device buffers, from now on
drivers/media/video/cpia.c +0 -4
@@ -38,10 +38,6 @@#include <linux/delay.h> #include <asm/io.h> #include <linux/mutex.h> - -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif #include "cpia.h"
drivers/media/video/usbvision/usbvision-core.c +0 -4
@@ -44,10 +44,6 @@#include <media/tuner.h> #include <linux/workqueue.h> - -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif #include "usbvision.h"
drivers/media/video/usbvision/usbvision-video.c +0 -4
@@ -68,10 +68,6 @@#include <media/tuner.h> #include <linux/workqueue.h> - -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif #include "usbvision.h" #include "usbvision-cards.h"
drivers/media/video/v4l1-compat.c +0 -4
@@ -35,10 +35,6 @@#include <asm/uaccess.h> #include <asm/system.h> #include <asm/pgtable.h> - -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif static unsigned int debug;module_param (debug, int,0644 );
drivers/media/video/v4l2-common.c +0 -4
@@ -59,10 +59,6 @@#define __OLD_VIDIOC_/* To allow fixing old calls*/ #include <media/v4l2-common.h> #include <media/v4l2-chip-ident.h> - -#ifdef CONFIG_KMOD -#include <linux/kmod.h> -#endif #include <linux/videodev2.h>
drivers/media/video/vino.c +1 -4
@@ -30,10 +30,7 @@#include <linux/mm.h> #include <linux/time.h> #include <linux/version.h> - -#ifdef CONFIG_KMOD #include <linux/kmod.h> -#endif #include <linux/i2c.h> #include <linux/i2c-algo-sgi.h>
@@ -4641,7 +4638,7 @@ static int __init vino_module_init(void) } vino_init_stage++; -#if defined(CONFIG_KMOD ) && defined(MODULE ) +#ifdef MODULE request_module ("saa7191" );request_module ("indycam" );#endif
drivers/media/video/w9968cf.c +2 -2
@@ -111,7 +111,7 @@ static int specific_debug = W9968CF_SPECstatic unsigned int param_nv[24 ];/* number of values per parameter */ -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES module_param (ovmod_load, bool,0644 );#endif module_param (simcams, ushort,0644 );
@@ -144,7 +144,7 @@ module_param(specific_debug, bool, 0644)module_param (specific_debug, bool,0644 );#endif -#ifdef CONFIG_KMOD +#ifdef CONFIG_MODULES MODULE_PARM_DESC (ovmod_load,"\n<0|1> Automatic 'ovcamchip' module loading." "\n0 disabled, 1 enabled."
drivers/mtd/mtdpart.c +0 -2
@@ -564,10 +564,8 @@ int parse_mtd_partitions(struct mtd_infofor ( ; ret <=0 && *types; types++) { parser =get_partition_parser (*types); -#ifdef CONFIG_KMOD if (!parser && !request_module ("%s" , *types)) parser =get_partition_parser (*types); -#endif if (!parser) {printk (KERN_NOTICE "%s partition parsing not available\n" , *types);
drivers/net/irda/sir_dongle.c +0 -2
@@ -67,9 +67,7 @@ int sirdev_get_dongle(struct sir_dev *deconst struct dongle_driver *drv =NULL ;int err = -EINVAL ; -#ifdef CONFIG_KMOD request_module ("irda-dongle-%d" , type); -#endif if (dev->dongle_drv !=NULL )return -EBUSY ;
drivers/net/ppp_generic.c +3 -7
@@ -2124,13 +2124,9 @@ ppp_set_compress(struct ppp *ppp, unsign || ccp_option[1] < 2 || ccp_option[1] > data.length) goto out; - cp =find_compressor (ccp_option[0 ]); -#ifdef CONFIG_KMOD -if (!cp) { -request_module ("ppp-compress-%d" , ccp_option[0 ]); - cp =find_compressor (ccp_option[0 ]); - } -#endif /* CONFIG_KMOD */ + cp =try_then_request_module ( +find_compressor (ccp_option[0 ]), +"ppp-compress-%d" , ccp_option[0 ]);if (!cp) goto out;
drivers/net/pppox.c +2 -7
@@ -115,13 +115,8 @@ static int pppox_create(struct net *net, goto out; rc = -EPROTONOSUPPORT ; -#ifdef CONFIG_KMOD -if (!pppox_protos[protocol]) { -char buffer[32 ]; -sprintf (buffer,"pppox-proto-%d" , protocol); -request_module (buffer); - } -#endif +if (!pppox_protos[protocol]) +request_module ("pppox-proto-%d" , protocol);if (!pppox_protos[protocol] || !try_module_get (pppox_protos[protocol]->owner)) goto out;
drivers/video/fbmem.c +2 -15
@@ -28,9 +28,7 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/console.h> -#ifdef CONFIG_KMOD #include <linux/kmod.h> -#endif #include <linux/err.h> #include <linux/device.h> #include <linux/efi.h>
@@ -837,13 +835,6 @@ fb_write(struct file *file, const char _return (cnt) ? cnt : err; } -#ifdef CONFIG_KMOD -static void try_to_load (int fb) -{ -request_module ("fb%d" , fb); -} -#endif /* CONFIG_KMOD */ -int fb_pan_display (struct fb_info *info,struct fb_var_screeninfo *var) {
@@ -1085,10 +1076,8 @@ fb_ioctl(struct inode *inode, struct filreturn -EINVAL ;if (con2fb.framebuffer <0 || con2fb.framebuffer >=FB_MAX )return -EINVAL ; -#ifdef CONFIG_KMOD if (!registered_fb[con2fb.framebuffer]) -try_to_load (con2fb.framebuffer); -#endif /* CONFIG_KMOD */ +request_module ("fb%d" , con2fb.framebuffer);if (!registered_fb[con2fb.framebuffer])return -EINVAL ; event.info = info;
@@ -1326,10 +1315,8 @@ fb_open(struct inode *inode, struct fileif (fbidx >=FB_MAX )return -ENODEV ;lock_kernel (); -#ifdef CONFIG_KMOD if (!(info = registered_fb[fbidx])) -try_to_load (fbidx); -#endif /* CONFIG_KMOD */ +request_module ("fb%d" , fbidx);if (!(info = registered_fb[fbidx])) { res = -ENODEV ; goto out;