diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 16:10:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-14 16:10:09 -0800 |
commit | e6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (patch) | |
tree | 88801365987a0dc64d62d47e8a11f3b44691c37f /drivers/platform/x86 | |
parent | 37da7bbbe84fe9e8862940d3f9194fd27dce59bb (diff) | |
parent | f1c488a78d9f1a22cdb15648c15e70fd82ed229a (diff) |
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg KH:
"Here's the set of driver core patches for 3.19-rc1.
They are dominated by the removal of the .owner field in platform
drivers. They touch a lot of files, but they are "simple" changes,
just removing a line in a structure.
Other than that, a few minor driver core and debugfs changes. There
are some ath9k patches coming in through this tree that have been
acked by the wireless maintainers as they relied on the debugfs
changes.
Everything has been in linux-next for a while"
* tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits)
Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries"
fs: debugfs: add forward declaration for struct device type
firmware class: Deletion of an unnecessary check before the function call "vunmap"
firmware loader: fix hung task warning dump
devcoredump: provide a one-way disable function
device: Add dev_<level>_once variants
ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries
ath: use seq_file api for ath9k debugfs files
debugfs: add helper function to create device related seq_file
drivers/base: cacheinfo: remove noisy error boot message
Revert "core: platform: add warning if driver has no owner"
drivers: base: support cpu cache information interface to userspace via sysfs
drivers: base: add cpu_device_create to support per-cpu devices
topology: replace custom attribute macros with standard DEVICE_ATTR*
cpumask: factor out show_cpumap into separate helper function
driver core: Fix unbalanced device reference in drivers_probe
driver core: fix race with userland in device_add()
sysfs/kernfs: make read requests on pre-alloc files use the buffer.
sysfs/kernfs: allow attributes to request write buffer be pre-allocated.
fs: sysfs: return EGBIG on write if offset is larger than file size
...
Diffstat (limited to 'drivers/platform/x86')
22 files changed, 0 insertions, 23 deletions
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 26c4fd1394da..3ac29a1e8f92 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -2117,7 +2117,6 @@ static void acer_platform_shutdown(struct platform_device *device) static struct platform_driver acer_platform_driver = { .driver = { .name = "acer-wmi", - .owner = THIS_MODULE, .pm = &acer_pm, }, .probe = acer_platform_probe, diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index f94467c05225..aaf37c5f12f9 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -533,7 +533,6 @@ static const struct dev_pm_ops acerhdf_pm_ops = { static struct platform_driver acerhdf_driver = { .driver = { .name = "acerhdf", - .owner = THIS_MODULE, .pm = &acerhdf_pm_ops, }, .probe = acerhdf_probe, diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c index c5af23b64438..1e1e59423889 100644 --- a/drivers/platform/x86/alienware-wmi.c +++ b/drivers/platform/x86/alienware-wmi.c @@ -157,7 +157,6 @@ static struct platform_zone *zone_data; static struct platform_driver platform_driver = { .driver = { .name = "alienware-wmi", - .owner = THIS_MODULE, } }; diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c index da36b5e824d4..0157625cb918 100644 --- a/drivers/platform/x86/amilo-rfkill.c +++ b/drivers/platform/x86/amilo-rfkill.c @@ -138,7 +138,6 @@ static int amilo_rfkill_remove(struct platform_device *device) static struct platform_driver amilo_rfkill_driver = { .driver = { .name = KBUILD_MODNAME, - .owner = THIS_MODULE, }, .probe = amilo_rfkill_probe, .remove = amilo_rfkill_remove, diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 7f4dc6f51f8a..05647f1a427e 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -1699,7 +1699,6 @@ static void asus_platform_exit(struct asus_laptop *asus) static struct platform_driver platform_driver = { .driver = { .name = ASUS_LAPTOP_FILE, - .owner = THIS_MODULE, }, }; diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c index 26bfd7bb5c13..15c0fab2bfa1 100644 --- a/drivers/platform/x86/compal-laptop.c +++ b/drivers/platform/x86/compal-laptop.c @@ -710,7 +710,6 @@ static int compal_remove(struct platform_device *); static struct platform_driver compal_driver = { .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, }, .probe = compal_probe, .remove = compal_remove, diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 233d2ee598a6..f6a28d7161f5 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -84,7 +84,6 @@ static struct calling_interface_token *da_tokens; static struct platform_driver platform_driver = { .driver = { .name = "dell-laptop", - .owner = THIS_MODULE, } }; diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index db79902c4a8e..5a54d35a61de 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -961,7 +961,6 @@ static const struct dev_pm_ops eeepc_pm_ops = { static struct platform_driver platform_driver = { .driver = { .name = EEEPC_LAPTOP_FILE, - .owner = THIS_MODULE, .pm = &eeepc_pm_ops, } }; diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 2655d4a988f3..be55bd78b503 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -559,7 +559,6 @@ static struct attribute_group fujitsupf_attribute_group = { static struct platform_driver fujitsupf_driver = { .driver = { .name = "fujitsu-laptop", - .owner = THIS_MODULE, } }; diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c index 777c7e3dda51..458e6c948c11 100644 --- a/drivers/platform/x86/hdaps.c +++ b/drivers/platform/x86/hdaps.c @@ -318,7 +318,6 @@ static struct platform_driver hdaps_driver = { .probe = hdaps_probe, .driver = { .name = "hdaps", - .owner = THIS_MODULE, .pm = &hdaps_pm, }, }; diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 4c559640dcba..0ab2b377a778 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -1006,7 +1006,6 @@ static const struct dev_pm_ops hp_wmi_pm_ops = { static struct platform_driver hp_wmi_driver = { .driver = { .name = "hp-wmi", - .owner = THIS_MODULE, .pm = &hp_wmi_pm_ops, }, .remove = __exit_p(hp_wmi_bios_remove), diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index ed494f37c40f..c860eace1ce3 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -966,7 +966,6 @@ static struct platform_driver ideapad_acpi_driver = { .remove = ideapad_acpi_remove, .driver = { .name = "ideapad_acpi", - .owner = THIS_MODULE, .pm = &ideapad_pm, .acpi_match_table = ACPI_PTR(ideapad_device_ids), }, diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c index 8d6775266d66..22606d6b2af3 100644 --- a/drivers/platform/x86/intel_mid_powerbtn.c +++ b/drivers/platform/x86/intel_mid_powerbtn.c @@ -133,7 +133,6 @@ static int mfld_pb_remove(struct platform_device *pdev) static struct platform_driver mfld_pb_driver = { .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, }, .probe = mfld_pb_probe, .remove = mfld_pb_remove, diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c index ab7860a21a22..0944e834af8d 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c @@ -555,7 +555,6 @@ static const struct platform_device_id therm_id_table[] = { static struct platform_driver mid_thermal_driver = { .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, .pm = &mid_thermal_pm, }, .probe = mid_thermal_probe, diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c index 4bc960416785..0afaaef5711f 100644 --- a/drivers/platform/x86/intel_oaktrail.c +++ b/drivers/platform/x86/intel_oaktrail.c @@ -288,7 +288,6 @@ static int oaktrail_remove(struct platform_device *pdev) static struct platform_driver oaktrail_driver = { .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, }, .probe = oaktrail_probe, .remove = oaktrail_remove, diff --git a/drivers/platform/x86/intel_pmic_gpio.c b/drivers/platform/x86/intel_pmic_gpio.c index 04fed00b88e9..709f0afdafa8 100644 --- a/drivers/platform/x86/intel_pmic_gpio.c +++ b/drivers/platform/x86/intel_pmic_gpio.c @@ -314,7 +314,6 @@ err2: static struct platform_driver platform_pmic_gpio_driver = { .driver = { .name = DRIVER_NAME, - .owner = THIS_MODULE, }, .probe = platform_pmic_gpio_probe, }; diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 62f8030b9e77..a3f06cb1063f 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -573,7 +573,6 @@ static struct attribute_group msipf_old_attribute_group = { static struct platform_driver msipf_driver = { .driver = { .name = "msi-laptop-pf", - .owner = THIS_MODULE, .pm = &msi_laptop_pm, }, }; diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c index 28d12bda3ac1..e6aac725a0af 100644 --- a/drivers/platform/x86/samsung-q10.c +++ b/drivers/platform/x86/samsung-q10.c @@ -82,7 +82,6 @@ static int samsungq10_remove(struct platform_device *pdev) static struct platform_driver samsungq10_driver = { .driver = { .name = KBUILD_MODNAME, - .owner = THIS_MODULE, }, .probe = samsungq10_probe, .remove = samsungq10_remove, diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 26ad9ff12ac5..a1a0fd72e9bf 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c @@ -581,7 +581,6 @@ static atomic_t sony_pf_users = ATOMIC_INIT(0); static struct platform_driver sony_pf_driver = { .driver = { .name = "sony-laptop", - .owner = THIS_MODULE, } }; static struct platform_device *sony_pf_device; diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index 6a6ea28a7e51..e36542564131 100644 --- a/drivers/platform/x86/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c @@ -234,7 +234,6 @@ static const struct dev_pm_ops tc1100_pm_ops = { static struct platform_driver tc1100_driver = { .driver = { .name = "tc1100-wmi", - .owner = THIS_MODULE, #ifdef CONFIG_PM .pm = &tc1100_pm_ops, #endif diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index cf0f89364d44..6414cfe5d848 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -972,7 +972,6 @@ static void tpacpi_shutdown_handler(struct platform_device *pdev) static struct platform_driver tpacpi_pdriver = { .driver = { .name = TPACPI_DRVR_NAME, - .owner = THIS_MODULE, .pm = &tpacpi_pm, }, .shutdown = tpacpi_shutdown_handler, @@ -981,7 +980,6 @@ static struct platform_driver tpacpi_pdriver = { static struct platform_driver tpacpi_hwmon_pdriver = { .driver = { .name = TPACPI_HWMON_DRVR_NAME, - .owner = THIS_MODULE, }, }; diff --git a/drivers/platform/x86/xo1-rfkill.c b/drivers/platform/x86/xo1-rfkill.c index 4bd17248dfc6..e46fa9cebc7d 100644 --- a/drivers/platform/x86/xo1-rfkill.c +++ b/drivers/platform/x86/xo1-rfkill.c @@ -71,7 +71,6 @@ static int xo1_rfkill_remove(struct platform_device *pdev) static struct platform_driver xo1_rfkill_driver = { .driver = { .name = "xo1-rfkill", - .owner = THIS_MODULE, }, .probe = xo1_rfkill_probe, .remove = xo1_rfkill_remove, |