Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c1056b42a87b59375f8f81a92ef029165f44fcce

Authored by Bart Van Assche
Committed by Len Brown
1 parent 51e20d0e3a
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning 

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 *.

Cc: stable@vger.kernel.org
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

include/acpi/acpi_drivers.h
Diff comments   View file @ c1056b4
... ... @@ -144,7 +144,7 @@
144 144 {
145 145 }
146 146 static inline int register_hotplug_dock_device(acpi_handle handle,
147   - struct acpi_dock_ops *ops,
  147 + const struct acpi_dock_ops *ops,
148 148 void *context)
149 149 {
150 150 return -ENODEV;