On Tue, Nov 20, 2012 at 10:34:04AM +0100, Rafael J. Wysocki wrote:
> On Tuesday, November 20, 2012 11:10:07 AM Mika Westerberg wrote:
> > On Tue, Nov 20, 2012 at 01:59:23AM +0100, Rafael J. Wysocki wrote:
> > > Index: linux/include/linux/device.h
> > > ===================================================================
> > > --- linux.orig/include/linux/device.h
> > > +++ linux/include/linux/device.h
> > > @@ -578,6 +578,12 @@ struct device_dma_parameters {
> > > unsigned long segment_boundary_mask;
> > > };
> > >
> > > +struct acpi_dev_node {
> > > +#ifdef CONFIG_ACPI
> > > + void *handle;
> > > +#endif
> > > +};
> > > +
> > > /**
> > > * struct device - The basic device structure
> > > * @parent: The device's "parent" device, the device to which it is attached.
> > > @@ -683,7 +689,7 @@ struct device {
> > > struct dev_archdata archdata;
> > >
> > > struct device_node *of_node; /* associated device tree node */
> > > - void *acpi_handle; /* associated ACPI device node */
> > > + struct acpi_dev_node acpi_node; /* associated ACPI device node */
> >
> > Please update the kerneldoc comment as well.
>
> Right, thanks for the reminder. :-)
>
> Updated patch is appended.
>
> Thanks,
> Rafael
>
>
> ---
> From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
> Subject: ACPI / driver core: Introduce struct acpi_dev_node and related macros
>
> To avoid adding an ACPI handle pointer to struct device on
> architectures that don't use ACPI, or generally when CONFIG_ACPI is
> not set, in which cases that pointer is useless, define struct
> acpi_dev_node that will contain the handle pointer if CONFIG_ACPI is
> set and will be empty otherwise and use it to represent the ACPI
> device node field in struct device.
>
> In addition to that define macros for reading and setting the ACPI
> handle of a device that don't generate code when CONFIG_ACPI is
> unset. Modify the ACPI subsystem to use those macros instead of
> referring to the given device's ACPI handle directly.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
