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

Commit 55955aad authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

PNPACPI sets pnpdev->dev.archdata 



Teach PNPACPI how to hook up its devices to their ACPI nodes, so that
pnpdev->dev.archdata points to the parallel acpi device node.  Previously
this only worked for PCI, leaving a notable hole.

Export "acpi_bus_type" so this can work.

Remove some extraneous whitespace.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 98701d1b

drivers/acpi/scan.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static void acpi_device_shutdown(struct device *dev) 
	return ;

}



static struct bus_type acpi_bus_type = {

struct bus_type acpi_bus_type = {

	.name		= "acpi",

	.suspend	= acpi_device_suspend,

	.resume		= acpi_device_resume,

drivers/pnp/pnpacpi/core.c

+46 −8
Original line number Diff line number Diff line
@@ -236,6 +236,42 @@ static acpi_status __init pnpacpi_add_device_handler(acpi_handle handle, 
	return AE_OK;

}



static int __init acpi_pnp_match(struct device *dev, void *_pnp)

{

	struct acpi_device	*acpi = to_acpi_device(dev);

	struct pnp_dev		*pnp = _pnp;



	/* true means it matched */

	return acpi->flags.hardware_id

		&& !acpi_get_physical_device(acpi->handle)

		&& compare_pnp_id(pnp->id, acpi->pnp.hardware_id);

}



static int __init acpi_pnp_find_device(struct device *dev, acpi_handle *handle)

{

	struct device		*adev;

	struct acpi_device	*acpi;



	adev = bus_find_device(&acpi_bus_type, NULL,

			to_pnp_dev(dev),

			acpi_pnp_match);

	if (!adev)

		return -ENODEV;



	acpi = to_acpi_device(adev);

	*handle = acpi->handle;

	put_device(adev);

	return 0;

}



/* complete initialization of a PNPACPI device includes having

 * pnpdev->dev.archdata.acpi_handle point to its ACPI sibling.

 */

static struct acpi_bus_type __initdata acpi_pnp_bus = {

	.bus = &pnp_bus_type,

	.find_device = acpi_pnp_find_device,

};



int pnpacpi_disabled __initdata;

static int __init pnpacpi_init(void)

{
@@ -245,8 +281,10 @@ static int __init pnpacpi_init(void) 
	}

	pnp_info("PnP ACPI init");

	pnp_register_protocol(&pnpacpi_protocol);

	register_acpi_bus_type(&acpi_pnp_bus);

	acpi_get_devices(NULL, pnpacpi_add_device_handler, NULL, NULL);

	pnp_info("PnP ACPI: found %d devices", num);

	unregister_acpi_bus_type(&acpi_pnp_bus);

	return 0;

}

subsys_initcall(pnpacpi_init);

include/acpi/acpi_bus.h

+3 −0
Original line number Diff line number Diff line
@@ -303,6 +303,9 @@ struct acpi_device { 
#define to_acpi_device(d)	container_of(d, struct acpi_device, dev)

#define to_acpi_driver(d)	container_of(d, struct acpi_driver, drv)



/* acpi_device.dev.bus == &acpi_bus_type */

extern struct bus_type acpi_bus_type;



/*

 * Events

 * ------