From 5534b6733d202b72e3e78be4e9b601b57120d1e3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 13 Aug 2014 14:02:05 +0200 Subject: char: xilinx_hwicap: Remove .owner field for driver There is no need to init .owner field. Based on the patch from Peter Griffin "mmc: remove .owner field for drivers using module_platform_driver" This patch removes the superflous .owner field for drivers which use the module_platform_driver API, as this is overriden in platform_driver_register anyway." Signed-off-by: Michal Simek Signed-off-by: Greg Kroah-Hartman --- drivers/char/xilinx_hwicap/xilinx_hwicap.c | 1 - 1 file changed, 1 deletion(-) (limited to 'drivers/char') diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 9b1a5ac4881d..c07dfe5c4da3 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c @@ -843,7 +843,6 @@ static struct platform_driver hwicap_platform_driver = { .probe = hwicap_drv_probe, .remove = hwicap_drv_remove, .driver = { - .owner = THIS_MODULE, .name = DRIVER_NAME, .of_match_table = hwicap_of_match, }, -- cgit v1.2.3 From 06c88b0d7ad87540405aea7f91d98ef43be04c95 Mon Sep 17 00:00:00 2001 From: Steven Honeyman Date: Fri, 5 Sep 2014 18:03:42 +0100 Subject: i8k: Add support for Dell Latitude E6540 Add support for the Dell Latitude E6540 which needs a different fan speed multiplier. Signed-off-by: Steven Honeyman Reviewed-by: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/char/i8k.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'drivers/char') diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 65525c7e903c..34174d01462e 100644 --- a/drivers/char/i8k.c +++ b/drivers/char/i8k.c @@ -651,6 +651,7 @@ struct i8k_config_data { enum i8k_configs { DELL_LATITUDE_D520, + DELL_LATITUDE_E6540, DELL_PRECISION_490, DELL_STUDIO, DELL_XPS_M140, @@ -661,6 +662,10 @@ static const struct i8k_config_data i8k_config_data[] = { .fan_mult = 1, .fan_max = I8K_FAN_TURBO, }, + [DELL_LATITUDE_E6540] = { + .fan_mult = 1, + .fan_max = I8K_FAN_HIGH, + }, [DELL_PRECISION_490] = { .fan_mult = 1, .fan_max = I8K_FAN_TURBO, @@ -705,6 +710,14 @@ static struct dmi_system_id i8k_dmi_table[] __initdata = { }, .driver_data = (void *)&i8k_config_data[DELL_LATITUDE_D520], }, + { + .ident = "Dell Latitude E6540", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Latitude E6540"), + }, + .driver_data = (void *)&i8k_config_data[DELL_LATITUDE_E6540], + }, { .ident = "Dell Latitude 2", .matches = { -- cgit v1.2.3