Skip to content

Commit 82303dd

Browse files
rafaeljwrafaeljw
committed
Merge branch 'acpi-bus'
Merge changes related to _OSC handling and updates eliminating the owner field from struct acpi_driver: - Make the kernel indicate support for several ACPI features that are in fact supported to the platform firmware through _OSC and fix the Generic Initiator Affinity _OSC bit (Armin Wolf). - Make the ACPI core set the owner value for ACPI drivers, drop the owner setting from a number of drivers and eliminate the owner field from struct acpi_driver (Krzysztof Kozlowski). * acpi-bus: (24 commits) ACPI: drop redundant owner from acpi_driver virt: vmgenid: drop owner assignment ptp: vmw: drop owner assignment platform/x86/wireless-hotkey: drop owner assignment platform/x86/toshiba_haps: drop owner assignment platform/x86/toshiba_bluetooth: drop owner assignment platform/x86/toshiba_acpi: drop owner assignment platform/x86/sony-laptop: drop owner assignment platform/x86/lg-laptop: drop owner assignment platform/x86/intel/smartconnect: drop owner assignment platform/x86/intel/rst: drop owner assignment platform/x86/eeepc: drop owner assignment platform/x86/dell: drop owner assignment platform: classmate-laptop: drop owner assignment platform: asus-laptop: drop owner assignment platform/chrome: wilco_ec: drop owner assignment net: fjes: drop owner assignment Input: atlas - drop owner assignment ACPI: store owner from modules with acpi_bus_register_driver() ACPI: bus: Indicate support for IRQ ResourceSource thru _OSC ...
2 parents 84fa7ad + 51373c5 commit 82303dd

File tree

20 files changed

+21
-29
lines changed

20 files changed

+21
-29
lines changed

‎drivers/acpi/bus.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,9 +316,14 @@ static void acpi_bus_osc_negotiate_platform_control(void)
316316
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PAD_SUPPORT;
317317
if (IS_ENABLED(CONFIG_ACPI_PROCESSOR))
318318
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PPC_OST_SUPPORT;
319+
if (IS_ENABLED(CONFIG_ACPI_THERMAL))
320+
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_FAST_THERMAL_SAMPLING_SUPPORT;
319321

320322
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_HOTPLUG_OST_SUPPORT;
321323
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;
324+
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_OVER_16_PSTATES_SUPPORT;
325+
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GED_SUPPORT;
326+
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_IRQ_RESOURCE_SOURCE_SUPPORT;
322327
if (IS_ENABLED(CONFIG_ACPI_PRMT))
323328
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;
324329
if (IS_ENABLED(CONFIG_ACPI_FFH))
@@ -990,25 +995,26 @@ EXPORT_SYMBOL_GPL(acpi_driver_match_device);
990995
-------------------------------------------------------------------------- */
991996

992997
/**
993-
* acpi_bus_register_driver - register a driver with the ACPI bus
998+
* __acpi_bus_register_driver - register a driver with the ACPI bus
994999
* @driver: driver being registered
1000+
* @owner: owning module/driver
9951001
*
9961002
* Registers a driver with the ACPI bus. Searches the namespace for all
9971003
* devices that match the driver's criteria and binds. Returns zero for
9981004
* success or a negative error status for failure.
9991005
*/
1000-
int acpi_bus_register_driver(struct acpi_driver *driver)
1006+
int __acpi_bus_register_driver(struct acpi_driver *driver, struct module *owner)
10011007
{
10021008
if (acpi_disabled)
10031009
return -ENODEV;
10041010
driver->drv.name = driver->name;
10051011
driver->drv.bus = &acpi_bus_type;
1006-
driver->drv.owner = driver->owner;
1012+
driver->drv.owner = owner;
10071013

10081014
return driver_register(&driver->drv);
10091015
}
10101016

1011-
EXPORT_SYMBOL(acpi_bus_register_driver);
1017+
EXPORT_SYMBOL(__acpi_bus_register_driver);
10121018

10131019
/**
10141020
* acpi_bus_unregister_driver - unregisters a driver with the ACPI bus

‎drivers/input/misc/atlas_btns.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ MODULE_DEVICE_TABLE(acpi, atlas_device_ids);
127127
static struct acpi_driver atlas_acpi_driver = {
128128
.name = ACPI_ATLAS_NAME,
129129
.class = ACPI_ATLAS_CLASS,
130-
.owner = THIS_MODULE,
131130
.ids = atlas_device_ids,
132131
.ops = {
133132
.add = atlas_acpi_button_add,

‎drivers/net/fjes/fjes_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ static void fjes_acpi_remove(struct acpi_device *device)
156156
static struct acpi_driver fjes_acpi_driver = {
157157
.name = DRV_NAME,
158158
.class = DRV_NAME,
159-
.owner = THIS_MODULE,
160159
.ids = fjes_acpi_ids,
161160
.ops = {
162161
.add = fjes_acpi_add,

‎drivers/platform/chrome/wilco_ec/event.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,6 @@ static struct acpi_driver event_driver = {
523523
.notify = event_device_notify,
524524
.remove = event_device_remove,
525525
},
526-
.owner = THIS_MODULE,
527526
};
528527

529528
static int __init event_module_init(void)

‎drivers/platform/x86/asus-laptop.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,6 @@ MODULE_DEVICE_TABLE(acpi, asus_device_ids);
19251925
static struct acpi_driver asus_acpi_driver = {
19261926
.name = ASUS_LAPTOP_NAME,
19271927
.class = ASUS_LAPTOP_CLASS,
1928-
.owner = THIS_MODULE,
19291928
.ids = asus_device_ids,
19301929
.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
19311930
.ops = {

‎drivers/platform/x86/classmate-laptop.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@ static const struct acpi_device_id cmpc_accel_device_ids_v4[] = {
434434
};
435435

436436
static struct acpi_driver cmpc_accel_acpi_driver_v4 = {
437-
.owner = THIS_MODULE,
438437
.name = "cmpc_accel_v4",
439438
.class = "cmpc_accel_v4",
440439
.ids = cmpc_accel_device_ids_v4,
@@ -660,7 +659,6 @@ static const struct acpi_device_id cmpc_accel_device_ids[] = {
660659
};
661660

662661
static struct acpi_driver cmpc_accel_acpi_driver = {
663-
.owner = THIS_MODULE,
664662
.name = "cmpc_accel",
665663
.class = "cmpc_accel",
666664
.ids = cmpc_accel_device_ids,
@@ -754,7 +752,6 @@ static const struct acpi_device_id cmpc_tablet_device_ids[] = {
754752
};
755753

756754
static struct acpi_driver cmpc_tablet_acpi_driver = {
757-
.owner = THIS_MODULE,
758755
.name = "cmpc_tablet",
759756
.class = "cmpc_tablet",
760757
.ids = cmpc_tablet_device_ids,
@@ -996,7 +993,6 @@ static const struct acpi_device_id cmpc_ipml_device_ids[] = {
996993
};
997994

998995
static struct acpi_driver cmpc_ipml_acpi_driver = {
999-
.owner = THIS_MODULE,
1000996
.name = "cmpc",
1001997
.class = "cmpc",
1002998
.ids = cmpc_ipml_device_ids,
@@ -1064,7 +1060,6 @@ static const struct acpi_device_id cmpc_keys_device_ids[] = {
10641060
};
10651061

10661062
static struct acpi_driver cmpc_keys_acpi_driver = {
1067-
.owner = THIS_MODULE,
10681063
.name = "cmpc_keys",
10691064
.class = "cmpc_keys",
10701065
.ids = cmpc_keys_device_ids,

‎drivers/platform/x86/dell/dell-rbtn.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ static struct acpi_driver rbtn_driver = {
295295
.remove = rbtn_remove,
296296
.notify = rbtn_notify,
297297
},
298-
.owner = THIS_MODULE,
299298
};
300299

301300

‎drivers/platform/x86/eeepc-laptop.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,6 @@ MODULE_DEVICE_TABLE(acpi, eeepc_device_ids);
14631463
static struct acpi_driver eeepc_acpi_driver = {
14641464
.name = EEEPC_LAPTOP_NAME,
14651465
.class = EEEPC_ACPI_CLASS,
1466-
.owner = THIS_MODULE,
14671466
.ids = eeepc_device_ids,
14681467
.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,
14691468
.ops = {

‎drivers/platform/x86/intel/rst.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ static const struct acpi_device_id irst_ids[] = {
125125
};
126126

127127
static struct acpi_driver irst_driver = {
128-
.owner = THIS_MODULE,
129128
.name = "intel_rapid_start",
130129
.class = "intel_rapid_start",
131130
.ids = irst_ids,

‎drivers/platform/x86/intel/smartconnect.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ static const struct acpi_device_id smartconnect_ids[] = {
3232
MODULE_DEVICE_TABLE(acpi, smartconnect_ids);
3333

3434
static struct acpi_driver smartconnect_driver = {
35-
.owner = THIS_MODULE,
3635
.name = "intel_smart_connect",
3736
.class = "intel_smart_connect",
3837
.ids = smartconnect_ids,

0 commit comments

Comments
 (0)