mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-21 08:53:41 +00:00
c1056b42a8
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>
158 lines
5.2 KiB
C
158 lines
5.2 KiB
C
/*
|
|
* acpi_drivers.h ($Revision: 31 $)
|
|
*
|
|
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
|
|
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
*
|
|
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
*/
|
|
|
|
#ifndef __ACPI_DRIVERS_H__
|
|
#define __ACPI_DRIVERS_H__
|
|
|
|
#include <linux/acpi.h>
|
|
#include <acpi/acpi_bus.h>
|
|
|
|
#define ACPI_MAX_STRING 80
|
|
|
|
/*
|
|
* Please update drivers/acpi/debug.c and Documentation/acpi/debug.txt
|
|
* if you add to this list.
|
|
*/
|
|
#define ACPI_BUS_COMPONENT 0x00010000
|
|
#define ACPI_AC_COMPONENT 0x00020000
|
|
#define ACPI_BATTERY_COMPONENT 0x00040000
|
|
#define ACPI_BUTTON_COMPONENT 0x00080000
|
|
#define ACPI_SBS_COMPONENT 0x00100000
|
|
#define ACPI_FAN_COMPONENT 0x00200000
|
|
#define ACPI_PCI_COMPONENT 0x00400000
|
|
#define ACPI_POWER_COMPONENT 0x00800000
|
|
#define ACPI_CONTAINER_COMPONENT 0x01000000
|
|
#define ACPI_SYSTEM_COMPONENT 0x02000000
|
|
#define ACPI_THERMAL_COMPONENT 0x04000000
|
|
#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000
|
|
#define ACPI_VIDEO_COMPONENT 0x10000000
|
|
#define ACPI_PROCESSOR_COMPONENT 0x20000000
|
|
|
|
/*
|
|
* _HID definitions
|
|
* HIDs must conform to ACPI spec(6.1.4)
|
|
* Linux specific HIDs do not apply to this and begin with LNX:
|
|
*/
|
|
|
|
#define ACPI_POWER_HID "LNXPOWER"
|
|
#define ACPI_PROCESSOR_OBJECT_HID "LNXCPU"
|
|
#define ACPI_SYSTEM_HID "LNXSYSTM"
|
|
#define ACPI_THERMAL_HID "LNXTHERM"
|
|
#define ACPI_BUTTON_HID_POWERF "LNXPWRBN"
|
|
#define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN"
|
|
#define ACPI_VIDEO_HID "LNXVIDEO"
|
|
#define ACPI_BAY_HID "LNXIOBAY"
|
|
#define ACPI_DOCK_HID "LNXDOCK"
|
|
/* Quirk for broken IBM BIOSes */
|
|
#define ACPI_SMBUS_IBM_HID "SMBUSIBM"
|
|
|
|
/*
|
|
* For fixed hardware buttons, we fabricate acpi_devices with HID
|
|
* ACPI_BUTTON_HID_POWERF or ACPI_BUTTON_HID_SLEEPF. Fixed hardware
|
|
* signals only an event; it doesn't supply a notification value.
|
|
* To allow drivers to treat notifications from fixed hardware the
|
|
* same as those from real devices, we turn the events into this
|
|
* notification value.
|
|
*/
|
|
#define ACPI_FIXED_HARDWARE_EVENT 0x100
|
|
|
|
/* --------------------------------------------------------------------------
|
|
PCI
|
|
-------------------------------------------------------------------------- */
|
|
|
|
|
|
/* ACPI PCI Interrupt Link (pci_link.c) */
|
|
|
|
int acpi_irq_penalty_init(void);
|
|
int acpi_pci_link_allocate_irq(acpi_handle handle, int index, int *triggering,
|
|
int *polarity, char **name);
|
|
int acpi_pci_link_free_irq(acpi_handle handle);
|
|
|
|
/* ACPI PCI Interrupt Routing (pci_irq.c) */
|
|
|
|
int acpi_pci_irq_add_prt(acpi_handle handle, struct pci_bus *bus);
|
|
void acpi_pci_irq_del_prt(struct pci_bus *bus);
|
|
|
|
/* ACPI PCI Device Binding (pci_bind.c) */
|
|
|
|
struct pci_bus;
|
|
|
|
struct pci_dev *acpi_get_pci_dev(acpi_handle);
|
|
int acpi_pci_bind_root(struct acpi_device *device);
|
|
|
|
/* Arch-defined function to add a bus to the system */
|
|
|
|
struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root);
|
|
void pci_acpi_crs_quirks(void);
|
|
|
|
/* --------------------------------------------------------------------------
|
|
Processor
|
|
-------------------------------------------------------------------------- */
|
|
|
|
#define ACPI_PROCESSOR_LIMIT_NONE 0x00
|
|
#define ACPI_PROCESSOR_LIMIT_INCREMENT 0x01
|
|
#define ACPI_PROCESSOR_LIMIT_DECREMENT 0x02
|
|
|
|
/*--------------------------------------------------------------------------
|
|
Dock Station
|
|
-------------------------------------------------------------------------- */
|
|
struct acpi_dock_ops {
|
|
acpi_notify_handler handler;
|
|
acpi_notify_handler uevent;
|
|
};
|
|
|
|
#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
|
|
extern int is_dock_device(acpi_handle handle);
|
|
extern int register_dock_notifier(struct notifier_block *nb);
|
|
extern void unregister_dock_notifier(struct notifier_block *nb);
|
|
extern int register_hotplug_dock_device(acpi_handle handle,
|
|
const struct acpi_dock_ops *ops,
|
|
void *context);
|
|
extern void unregister_hotplug_dock_device(acpi_handle handle);
|
|
#else
|
|
static inline int is_dock_device(acpi_handle handle)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline int register_dock_notifier(struct notifier_block *nb)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline void unregister_dock_notifier(struct notifier_block *nb)
|
|
{
|
|
}
|
|
static inline int register_hotplug_dock_device(acpi_handle handle,
|
|
const struct acpi_dock_ops *ops,
|
|
void *context)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
static inline void unregister_hotplug_dock_device(acpi_handle handle)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
#endif /*__ACPI_DRIVERS_H__*/
|