Subject: Change ACPI to use dev_sysdata instead of firmware_data From: Benjamin Herrenschmidt This patch changes ACPI to use the new dev_sysdata on i386, x86_64 and amd64 (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. Only build-tested on x86 Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Arnd Bergmann drivers/acpi/glue.c | 20 +++++++++++--------- include/acpi/acpi_bus.h | 2 +- include/asm-i386/device.h | 3 +++ include/asm-ia64/device.h | 3 +++ include/asm-x86_64/device.h | 3 +++ include/linux/device.h | 2 -- 6 files changed, 21 insertions(+), 12 deletions(-) Index: linux-2.6/drivers/acpi/glue.c =================================================================== --- linux-2.6.orig/drivers/acpi/glue.c +++ linux-2.6/drivers/acpi/glue.c @@ -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 d if (!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 Index: linux-2.6/include/acpi/acpi_bus.h =================================================================== --- linux-2.6.orig/include/acpi/acpi_bus.h +++ linux-2.6/include/acpi/acpi_bus.h @@ -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 */ Index: linux-2.6/include/asm-i386/device.h =================================================================== --- linux-2.6.orig/include/asm-i386/device.h +++ linux-2.6/include/asm-i386/device.h @@ -9,6 +9,9 @@ #define _ASM_DEVICE_H struct dev_sysdata { +#ifdef CONFIG_ACPI + void *acpi_handle; +#endif }; #endif /* _ASM_DEVICE_H */ Index: linux-2.6/include/linux/device.h =================================================================== --- linux-2.6.orig/include/linux/device.h +++ linux-2.6/include/linux/device.h @@ -343,8 +343,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) */ Index: linux-2.6/include/asm-x86_64/device.h =================================================================== --- linux-2.6.orig/include/asm-x86_64/device.h +++ linux-2.6/include/asm-x86_64/device.h @@ -9,6 +9,9 @@ #define _ASM_DEVICE_H struct dev_sysdata { +#ifdef CONFIG_ACPI + void *acpi_handle; +#endif }; #endif /* _ASM_DEVICE_H */ Index: linux-2.6/include/asm-ia64/device.h =================================================================== --- linux-2.6.orig/include/asm-ia64/device.h +++ linux-2.6/include/asm-ia64/device.h @@ -9,6 +9,9 @@ #define _ASM_DEVICE_H struct dev_sysdata { +#ifdef CONFIG_ACPI + void *acpi_handle; +#endif }; #endif /* _ASM_DEVICE_H */