Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 465ae641 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Greg Kroah-Hartman
Browse files

ACPI: Change ACPI to use dev_archdata instead of firmware_data 



Change ACPI to use dev_archdata instead of firmware_data

This patch changes ACPI to use the new dev_archdata on i386, x86_64
and ia64 (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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c6dbaef2

drivers/acpi/glue.c

+11 −9
Original line number Diff line number Diff line
@@ -267,9 +267,9 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle) 
{

	acpi_status status;



	if (dev->firmware_data) {

	if (dev->archdata.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 *dev, acpi_handle handle) 
		put_device(dev);

		return -EINVAL;

	}

	dev->firmware_data = handle;

	dev->archdata.acpi_handle = handle;



	return 0;

}



static int acpi_unbind_one(struct device *dev)

{

	if (!dev->firmware_data)

	if (!dev->archdata.acpi_handle)

		return 0;

	if (dev == acpi_get_physical_device(dev->firmware_data)) {

	if (dev == acpi_get_physical_device(dev->archdata.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->archdata.acpi_handle,

				 acpi_glue_data_handler);

		dev->archdata.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 device *dev) 
	if (!ret) {

		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };



		acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer);

		acpi_get_name(dev->archdata.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
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ struct device *acpi_get_physical_device(acpi_handle); 
/* 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)->archdata.acpi_handle))



#endif /* CONFIG_ACPI */

include/asm-i386/device.h

+9 −1
Original line number Diff line number Diff line
@@ -3,5 +3,13 @@ 
 *

 * This file is released under the GPLv2

 */

#include <asm-generic/device.h>

#ifndef _ASM_I386_DEVICE_H

#define _ASM_I386_DEVICE_H



struct dev_archdata {

#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

};



#endif /* _ASM_I386_DEVICE_H */

include/asm-ia64/device.h

+9 −1
Original line number Diff line number Diff line
@@ -3,5 +3,13 @@ 
 *

 * This file is released under the GPLv2

 */

#include <asm-generic/device.h>

#ifndef _ASM_IA64_DEVICE_H

#define _ASM_IA64_DEVICE_H



struct dev_archdata {

#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

};



#endif /* _ASM_IA64_DEVICE_H */

include/asm-x86_64/device.h

+9 −1
Original line number Diff line number Diff line
@@ -3,5 +3,13 @@ 
 *

 * This file is released under the GPLv2

 */

#include <asm-generic/device.h>

#ifndef _ASM_X86_64_DEVICE_H

#define _ASM_X86_64_DEVICE_H



struct dev_archdata {

#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

};



#endif /* _ASM_X86_64_DEVICE_H */