| From c1056b42a87b59375f8f81a92ef029165f44fcce Mon Sep 17 00:00:00 2001 |
| From: Bart Van Assche <bvanassche@acm.org> |
| Date: Wed, 2 Nov 2011 20:16:05 +0100 |
| Subject: ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning |
| |
| From: Bart Van Assche <bvanassche@acm.org> |
| |
| commit c1056b42a87b59375f8f81a92ef029165f44fcce upstream. |
| |
| Recently the ACPI ops structs were constified but the inline version |
| of register_hotplug_dock_device() was overlooked (see also commit |
| 9c8b04b, June 25 2011). Update the inline function |
| register_hotplug_dock_device() that is enabled with |
| CONFIG_ACPI_DOCK=n too. This patch fixes at least the following |
| compiler warnings: |
| |
| drivers/ata/libata-acpi.c: In function .ata_acpi_associate.: |
| drivers/ata/libata-acpi.c:266:11: warning: passing argument 2 of .register_hotplug_dock_device. discards qualifiers from pointer target type |
| include/acpi/acpi_drivers.h:146:19: note: expected .struct acpi_dock_ops *. but argument is of type .const struct acpi_dock_ops *. |
| drivers/ata/libata-acpi.c:275:11: warning: passing argument 2 of .register_hotplug_dock_device. discards qualifiers from pointer target type |
| include/acpi/acpi_drivers.h:146:19: note: expected .struct acpi_dock_ops *. but argument is of type .const struct acpi_dock_ops *. |
| |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| include/acpi/acpi_drivers.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/include/acpi/acpi_drivers.h |
| +++ b/include/acpi/acpi_drivers.h |
| @@ -144,7 +144,7 @@ static inline void unregister_dock_notif |
| { |
| } |
| static inline int register_hotplug_dock_device(acpi_handle handle, |
| - struct acpi_dock_ops *ops, |
| + const struct acpi_dock_ops *ops, |
| void *context) |
| { |
| return -ENODEV; |
