From dfcba200679dc3f62212154b65b40b835ce69ab7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 8 Feb 2007 00:06:32 +0000 Subject: [PATCH] backlight: Remove unneeded owner field Remove uneeded owner field from backlight_properties structure. Nothing uses it and it is unlikely that it will ever be used. The backlight class uses other means to ensure that nothing references unloaded code. Based on a patch from Dmitry Torokhov Signed-off-by: Richard Purdie --- drivers/acpi/asus_acpi.c | 1 - drivers/acpi/ibm_acpi.c | 1 - drivers/acpi/toshiba_acpi.c | 1 - drivers/acpi/video.c | 1 - drivers/macintosh/via-pmu-backlight.c | 1 - drivers/misc/asus-laptop.c | 1 - drivers/misc/msi-laptop.c | 1 - drivers/misc/sony-laptop.c | 1 - drivers/usb/misc/appledisplay.c | 1 - drivers/video/aty/aty128fb.c | 1 - drivers/video/aty/atyfb_base.c | 1 - drivers/video/aty/radeon_backlight.c | 1 - drivers/video/backlight/corgi_bl.c | 1 - drivers/video/backlight/hp680_bl.c | 1 - drivers/video/backlight/locomolcd.c | 1 - drivers/video/backlight/progear_bl.c | 1 - drivers/video/nvidia/nv_backlight.c | 1 - drivers/video/riva/fbdev.c | 1 - include/linux/backlight.h | 3 --- include/linux/lcd.h | 2 -- 20 files changed, 23 deletions(-) diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c index 772299fb5f..906c54f9ba 100644 --- a/drivers/acpi/asus_acpi.c +++ b/drivers/acpi/asus_acpi.c @@ -1353,7 +1353,6 @@ static int asus_hotk_remove(struct acpi_device *device, int type) } static struct backlight_properties asus_backlight_data = { - .owner = THIS_MODULE, .get_brightness = read_brightness, .update_status = set_brightness_status, .max_brightness = 15, diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c index 1a0ed3dc40..accf4f7da8 100644 --- a/drivers/acpi/ibm_acpi.c +++ b/drivers/acpi/ibm_acpi.c @@ -1705,7 +1705,6 @@ static int brightness_update_status(struct backlight_device *bd) } static struct backlight_properties ibm_backlight_data = { - .owner = THIS_MODULE, .get_brightness = brightness_get, .update_status = brightness_update_status, .max_brightness = 7, diff --git a/drivers/acpi/toshiba_acpi.c b/drivers/acpi/toshiba_acpi.c index faf8a5232d..efc3669a84 100644 --- a/drivers/acpi/toshiba_acpi.c +++ b/drivers/acpi/toshiba_acpi.c @@ -534,7 +534,6 @@ static acpi_status __exit remove_device(void) } static struct backlight_properties toshiba_backlight_data = { - .owner = THIS_MODULE, .get_brightness = get_lcd, .update_status = set_lcd_status, .max_brightness = HCI_LCD_BRIGHTNESS_LEVELS - 1, diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index bf525cca3b..75e422bd92 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c @@ -621,7 +621,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) kfree(name); return; } - acpi_video_data->owner = THIS_MODULE; acpi_video_data->get_brightness = acpi_video_get_brightness; acpi_video_data->update_status = diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c index 801a974342..db8bcc35bc 100644 --- a/drivers/macintosh/via-pmu-backlight.c +++ b/drivers/macintosh/via-pmu-backlight.c @@ -111,7 +111,6 @@ static int pmu_backlight_get_brightness(struct backlight_device *bd) } static struct backlight_properties pmu_backlight_data = { - .owner = THIS_MODULE, .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, .max_brightness = (FB_BACKLIGHT_LEVELS - 1), diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index e4e2b707a3..d15ee5e342 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c @@ -196,7 +196,6 @@ static struct backlight_device *asus_backlight_device; static int read_brightness(struct backlight_device *bd); static int update_bl_status(struct backlight_device *bd); static struct backlight_properties asusbl_data = { - .owner = THIS_MODULE, .get_brightness = read_brightness, .update_status = update_bl_status, .max_brightness = 15, diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c index 8e5e07e4c1..dd4d92e031 100644 --- a/drivers/misc/msi-laptop.c +++ b/drivers/misc/msi-laptop.c @@ -161,7 +161,6 @@ static int bl_update_status(struct backlight_device *b) } static struct backlight_properties msibl_props = { - .owner = THIS_MODULE, .get_brightness = bl_get_brightness, .update_status = bl_update_status, .max_brightness = MSI_LCD_LEVEL_MAX-1, diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index cabbed0015..03d02bd9f1 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c @@ -399,7 +399,6 @@ static int sony_backlight_get_brightness(struct backlight_device *bd) static struct backlight_device *sony_backlight_device; static struct backlight_properties sony_backlight_properties = { - .owner = THIS_MODULE, .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, .max_brightness = SONY_MAX_BRIGHTNESS - 1, diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index e573c8ba97..416cde5893 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c @@ -178,7 +178,6 @@ static int appledisplay_bl_get_brightness(struct backlight_device *bd) } static struct backlight_properties appledisplay_bl_data = { - .owner = THIS_MODULE, .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, .max_brightness = 0xFF diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 2e976ffcde..1fa211c0d7 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c @@ -1797,7 +1797,6 @@ static int aty128_bl_get_brightness(struct backlight_device *bd) } static struct backlight_properties aty128_bl_data = { - .owner = THIS_MODULE, .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, .max_brightness = (FB_BACKLIGHT_LEVELS - 1), diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 301612cef3..5ea5a00e58 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -2178,7 +2178,6 @@ static int aty_bl_get_brightness(struct backlight_device *bd) } static struct backlight_properties aty_bl_data = { - .owner = THIS_MODULE, .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, .max_brightness = (FB_BACKLIGHT_LEVELS - 1), diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index 3abfd4a380..8b66df6f19 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c @@ -134,7 +134,6 @@ static int radeon_bl_get_brightness(struct backlight_device *bd) } static struct backlight_properties radeon_bl_data = { - .owner = THIS_MODULE, .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, .max_brightness = (FB_BACKLIGHT_LEVELS - 1), diff --git a/drivers/video/backlight/corgi_bl.c b/drivers/video/backlight/corgi_bl.c index fde1d95181..4ca24e2615 100644 --- a/drivers/video/backlight/corgi_bl.c +++ b/drivers/video/backlight/corgi_bl.c @@ -106,7 +106,6 @@ EXPORT_SYMBOL(corgibl_limit_intensity); static struct backlight_properties corgibl_data = { - .owner = THIS_MODULE, .get_brightness = corgibl_get_intensity, .update_status = corgibl_set_intensity, }; diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c index c07d8207fb..074625a46e 100644 --- a/drivers/video/backlight/hp680_bl.c +++ b/drivers/video/backlight/hp680_bl.c @@ -96,7 +96,6 @@ static int hp680bl_get_intensity(struct backlight_device *bd) } static struct backlight_properties hp680bl_data = { - .owner = THIS_MODULE, .max_brightness = HP680_MAX_INTENSITY, .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c index fc812d96c3..3c5abbf0d0 100644 --- a/drivers/video/backlight/locomolcd.c +++ b/drivers/video/backlight/locomolcd.c @@ -142,7 +142,6 @@ static int locomolcd_get_intensity(struct backlight_device *bd) } static struct backlight_properties locomobl_data = { - .owner = THIS_MODULE, .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, .max_brightness = 4, diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c index 13d831da8d..42d6acd96c 100644 --- a/drivers/video/backlight/progear_bl.c +++ b/drivers/video/backlight/progear_bl.c @@ -56,7 +56,6 @@ static int progearbl_get_intensity(struct backlight_device *bd) } static struct backlight_properties progearbl_data = { - .owner = THIS_MODULE, .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c index df934bd218..4254c090dc 100644 --- a/drivers/video/nvidia/nv_backlight.c +++ b/drivers/video/nvidia/nv_backlight.c @@ -104,7 +104,6 @@ static int nvidia_bl_get_brightness(struct backlight_device *bd) } static struct backlight_properties nvidia_bl_data = { - .owner = THIS_MODULE, .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, .max_brightness = (FB_BACKLIGHT_LEVELS - 1), diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index f2e9b742c9..fd825711bb 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -347,7 +347,6 @@ static int riva_bl_get_brightness(struct backlight_device *bd) } static struct backlight_properties riva_bl_data = { - .owner = THIS_MODULE, .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, .max_brightness = (FB_BACKLIGHT_LEVELS - 1), diff --git a/include/linux/backlight.h b/include/linux/backlight.h index a5cf1beacb..287c62d956 100644 --- a/include/linux/backlight.h +++ b/include/linux/backlight.h @@ -17,9 +17,6 @@ struct fb_info; /* This structure defines all the properties of a backlight (usually attached to a LCD). */ struct backlight_properties { - /* Owner module */ - struct module *owner; - /* Notify the backlight driver some property has changed */ int (*update_status)(struct backlight_device *); /* Return the current backlight brightness (accounting for power, diff --git a/include/linux/lcd.h b/include/linux/lcd.h index d739b2e7ea..8a468f168c 100644 --- a/include/linux/lcd.h +++ b/include/linux/lcd.h @@ -16,8 +16,6 @@ struct fb_info; /* This structure defines all the properties of a LCD flat panel. */ struct lcd_properties { - /* Owner module */ - struct module *owner; /* Get the LCD panel power status (0: full on, 1..3: controller power on, flat panel power off, 4: full off), see FB_BLANK_XXX */ int (*get_power)(struct lcd_device *); -- 2.39.5