Use dev_sysdata for ACPI and remove firmware_data
Subsystems (3)
PATCH 2/2 Use dev_sysdata for ACPI and remove firmware_data
This patch changes ACPI to use the new dev_sysdata on x86 and x86_64 (is there any other arch using ACPI ?) to store it's acpi_handle. It also removes the firmware_data field from struct device as this was the only user.
drivers/acpi/glue.c +11 -9
@@ -267,9 +267,9 @@ static int acpi_bind_one(struct device * {acpi_status status; -if (dev->firmware_data) { +if (dev->sysdata.acpi_handle) { printk(KERN_WARNING PREFIX - "Drivers changed 'firmware_data' for %s\n", dev->bus_id); + "Drivers changed 'acpi_handle' for %s\n", dev->bus_id);return -EINVAL ; }get_device (dev);
@@ -278,25 +278,26 @@ static int acpi_bind_one(struct device *put_device (dev);return -EINVAL ; } - dev->firmware_data = handle; + dev->sysdata.acpi_handle = handle;return 0 ; }static int acpi_unbind_one (struct device *dev) { -if (!dev->firmware_data) +if (!dev->sysdata.acpi_handle)return 0 ; -if (dev ==acpi_get_physical_device (dev->firmware_data)) { +if (dev ==acpi_get_physical_device (dev->sysdata.acpi_handle)) {/* acpi_get_physical_device increase refcnt by one */ put_device (dev); -acpi_detach_data (dev->firmware_data, acpi_glue_data_handler); - dev->firmware_data =NULL ; +acpi_detach_data (dev->sysdata.acpi_handle, + acpi_glue_data_handler); + dev->sysdata.acpi_handle =NULL ;/* acpi_bind_one increase refcnt by one */ put_device (dev); }else { printk(KERN_ERR PREFIX - "Oops, 'firmware_data' corrupt for %s\n", dev->bus_id); + "Oops, 'acpi_handle' corrupt for %s\n", dev->bus_id); }return 0 ; }
@@ -328,7 +329,8 @@ static int acpi_platform_notify(struct dif (!ret) {struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER ,NULL }; -acpi_get_name (dev->firmware_data,ACPI_FULL_PATHNAME , &buffer); +acpi_get_name (dev->sysdata.acpi_handle, +ACPI_FULL_PATHNAME , &buffer);DBG ("Device %s -> %s\n" , dev->bus_id, (char *)buffer.pointer);kfree (buffer.pointer); }else
include/acpi/acpi_bus.h +1 -1
@@ -357,7 +357,7 @@ struct device *acpi_get_physical_device(/* helper */ acpi_handle acpi_get_child (acpi_handle ,acpi_integer );acpi_handle acpi_get_pci_rootbridge_handle (unsigned int ,unsigned int ); -#define DEVICE_ACPI_HANDLE (dev) ((acpi_handle)((dev)->firmware_data)) +#define DEVICE_ACPI_HANDLE (dev) ((acpi_handle)((dev)->sysdata.acpi_handle))#endif /* CONFIG_ACPI */
include/asm-i386/device.h +3 -0
@@ -9,6 +9,9 @@#define _ASM_DEVICE_Hstruct dev_sysdata { +#ifdef CONFIG_ACPI +void *acpi_handle; +#endif };#endif /* _ASM_DEVICE_H */
include/linux/device.h +0 -2
@@ -368,8 +368,6 @@ struct device {void *driver_data;/* data private to the driver */ void *platform_data;/* Platform specific data, device core doesn't touch it */ -void *firmware_data;/* Firmware specific data (e.g. ACPI, -BIOS data),reserved for device core*/ struct dev_pm_info power;u64 *dma_mask;/* dma mask (if dma'able device) */
include/asm-x86_64/device.h +3 -0
@@ -9,6 +9,9 @@#define _ASM_DEVICE_Hstruct dev_sysdata { +#ifdef CONFIG_ACPI +void *acpi_handle; +#endif };#endif /* _ASM_DEVICE_H */
Quoted 3 lines · Benjamin Herrenschmidt
This patch changes ACPI to use the new
dev_sysdataon x86 andx86_64(is there any other arch using ACPI ?) to store it'sacpi_handle. It also removes thefirmware_datafield from struct device as this was the only user.
Yeah! I've wanted to drop firmware_data for a while now :)
thanks,
gre k-h
Len Brown
Acked-byQuoted 6 lines · Greg KH
Quoted 3 lines · Benjamin Herrenschmidt
This patch changes ACPI to use the new
dev_sysdataon x86 andx86_64(is there any other arch using ACPI ?) to store it'sacpi_handle. It also removes thefirmware_datafield from struct device as this was the only user.Yeah! I've wanted to drop
firmware_datafor a while now :)
device.firmware_data was born when we went to link Linux devices and ACPI devices using device.platform_data and found it was already used. You recommended we create a new field to avoid the conflict, and IIR the discussion suggested that eventually device.platform_data use would get cleaned up and the fields could perhaps some day be combined.
I don't know if we are any closer to that day, before or after this change.
However, I'm fine with Ben's re-name -- it changes no functionality on ACPI-enabled systems while potentially deleting an unused pointer/dev on other architectures.
Please ship his patch #2 along with patch #1 that it depends on.
thanks
-Len
Quoted 8 lines
device.firmware_data was born when we went to link Linux devices and ACPI devices using device.platform_data and found it was already used. You recommended we create a new field to avoid the conflict, and IIR the discussion suggested that eventually device.platform_data use would get cleaned up and the fields could perhaps some day be combined.
I don't know if we are any closer to that day, before or after this change.
I've audited use of platform data and plan to get rid of it too :-)
(Or actually move it to platform_device where it belongs and fix other abusers)
Quoted 6 lines
However, I'm fine with Ben's re-name -- it changes no functionality on ACPI-enabled systems while potentially deleting an unused pointer/dev on other architectures.
Please ship his patch #2 along with patch #1 that it depends on.
Acked-by Len Brown <[email protected]>
Excellent, thanks !
Cheers,
Ben.