Commit c2b6705b authored by Len Brown's avatar Len Brown

ACPI: fix acpi_driver.name usage

It was erroneously used as a description rather than a name.

ie. turn this:

lenb@se7525gp2:/sys> ls bus/acpi/drivers
ACPI AC Adapter Driver  ACPI Embedded Controller Driver  ACPI Power Resource Driver
ACPI Battery Driver     ACPI Fan Driver                  ACPI Processor Driver
ACPI Button Driver      ACPI PCI Interrupt Link Driver   ACPI Thermal Zone Driver
ACPI container driver   ACPI PCI Root Bridge Driver      hpet

into this:

lenb@se7525gp2:~> ls /sys/bus/acpi/drivers
ac  battery  button  container  ec  fan  hpet  pci_link  pci_root  power  processor  thermal
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent f52fd66d
...@@ -58,7 +58,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type); ...@@ -58,7 +58,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type);
static int acpi_ac_open_fs(struct inode *inode, struct file *file); static int acpi_ac_open_fs(struct inode *inode, struct file *file);
static struct acpi_driver acpi_ac_driver = { static struct acpi_driver acpi_ac_driver = {
.name = ACPI_AC_DRIVER_NAME, .name = "ac",
.class = ACPI_AC_CLASS, .class = ACPI_AC_CLASS,
.ids = ACPI_AC_HID, .ids = ACPI_AC_HID,
.ops = { .ops = {
......
...@@ -60,7 +60,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type); ...@@ -60,7 +60,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type);
static int acpi_memory_device_start(struct acpi_device *device); static int acpi_memory_device_start(struct acpi_device *device);
static struct acpi_driver acpi_memory_device_driver = { static struct acpi_driver acpi_memory_device_driver = {
.name = ACPI_MEMORY_DEVICE_DRIVER_NAME, .name = "acpi_memhotplug",
.class = ACPI_MEMORY_DEVICE_CLASS, .class = ACPI_MEMORY_DEVICE_CLASS,
.ids = ACPI_MEMORY_DEVICE_HID, .ids = ACPI_MEMORY_DEVICE_HID,
.ops = { .ops = {
......
...@@ -421,7 +421,7 @@ static struct asus_hotk *hotk; ...@@ -421,7 +421,7 @@ static struct asus_hotk *hotk;
static int asus_hotk_add(struct acpi_device *device); static int asus_hotk_add(struct acpi_device *device);
static int asus_hotk_remove(struct acpi_device *device, int type); static int asus_hotk_remove(struct acpi_device *device, int type);
static struct acpi_driver asus_hotk_driver = { static struct acpi_driver asus_hotk_driver = {
.name = ACPI_HOTK_NAME, .name = "asus_acpi",
.class = ACPI_HOTK_CLASS, .class = ACPI_HOTK_CLASS,
.ids = ACPI_HOTK_HID, .ids = ACPI_HOTK_HID,
.ops = { .ops = {
......
...@@ -67,7 +67,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type); ...@@ -67,7 +67,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type);
static int acpi_battery_resume(struct acpi_device *device); static int acpi_battery_resume(struct acpi_device *device);
static struct acpi_driver acpi_battery_driver = { static struct acpi_driver acpi_battery_driver = {
.name = ACPI_BATTERY_DRIVER_NAME, .name = "battery",
.class = ACPI_BATTERY_CLASS, .class = ACPI_BATTERY_CLASS,
.ids = ACPI_BATTERY_HID, .ids = ACPI_BATTERY_HID,
.ops = { .ops = {
......
...@@ -51,7 +51,7 @@ static int acpi_bay_add(struct acpi_device *device); ...@@ -51,7 +51,7 @@ static int acpi_bay_add(struct acpi_device *device);
static int acpi_bay_remove(struct acpi_device *device, int type); static int acpi_bay_remove(struct acpi_device *device, int type);
static struct acpi_driver acpi_bay_driver = { static struct acpi_driver acpi_bay_driver = {
.name = ACPI_BAY_DRIVER_NAME, .name = "bay",
.class = ACPI_BAY_CLASS, .class = ACPI_BAY_CLASS,
.ids = ACPI_BAY_HID, .ids = ACPI_BAY_HID,
.ops = { .ops = {
......
...@@ -73,7 +73,7 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file); ...@@ -73,7 +73,7 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file);
static int acpi_button_state_open_fs(struct inode *inode, struct file *file); static int acpi_button_state_open_fs(struct inode *inode, struct file *file);
static struct acpi_driver acpi_button_driver = { static struct acpi_driver acpi_button_driver = {
.name = ACPI_BUTTON_DRIVER_NAME, .name = "button",
.class = ACPI_BUTTON_CLASS, .class = ACPI_BUTTON_CLASS,
.ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E", .ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E",
.ops = { .ops = {
......
...@@ -56,7 +56,7 @@ static int acpi_container_add(struct acpi_device *device); ...@@ -56,7 +56,7 @@ static int acpi_container_add(struct acpi_device *device);
static int acpi_container_remove(struct acpi_device *device, int type); static int acpi_container_remove(struct acpi_device *device, int type);
static struct acpi_driver acpi_container_driver = { static struct acpi_driver acpi_container_driver = {
.name = ACPI_CONTAINER_DRIVER_NAME, .name = "container",
.class = ACPI_CONTAINER_CLASS, .class = ACPI_CONTAINER_CLASS,
.ids = "ACPI0004,PNP0A05,PNP0A06", .ids = "ACPI0004,PNP0A05,PNP0A06",
.ops = { .ops = {
......
...@@ -80,7 +80,7 @@ static int acpi_ec_stop(struct acpi_device *device, int type); ...@@ -80,7 +80,7 @@ static int acpi_ec_stop(struct acpi_device *device, int type);
static int acpi_ec_add(struct acpi_device *device); static int acpi_ec_add(struct acpi_device *device);
static struct acpi_driver acpi_ec_driver = { static struct acpi_driver acpi_ec_driver = {
.name = ACPI_EC_DRIVER_NAME, .name = "ec",
.class = ACPI_EC_CLASS, .class = ACPI_EC_CLASS,
.ids = ACPI_EC_HID, .ids = ACPI_EC_HID,
.ops = { .ops = {
......
...@@ -52,7 +52,7 @@ static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state); ...@@ -52,7 +52,7 @@ static int acpi_fan_suspend(struct acpi_device *device, pm_message_t state);
static int acpi_fan_resume(struct acpi_device *device); static int acpi_fan_resume(struct acpi_device *device);
static struct acpi_driver acpi_fan_driver = { static struct acpi_driver acpi_fan_driver = {
.name = ACPI_FAN_DRIVER_NAME, .name = "fan",
.class = ACPI_FAN_CLASS, .class = ACPI_FAN_CLASS,
.ids = "PNP0C0B", .ids = "PNP0C0B",
.ops = { .ops = {
......
...@@ -39,7 +39,7 @@ static int acpi_ec_hc_add(struct acpi_device *device); ...@@ -39,7 +39,7 @@ static int acpi_ec_hc_add(struct acpi_device *device);
static int acpi_ec_hc_remove(struct acpi_device *device, int type); static int acpi_ec_hc_remove(struct acpi_device *device, int type);
static struct acpi_driver acpi_ec_hc_driver = { static struct acpi_driver acpi_ec_hc_driver = {
.name = ACPI_EC_HC_DRIVER_NAME, .name = "i2c_ec",
.class = ACPI_EC_HC_CLASS, .class = ACPI_EC_HC_CLASS,
.ids = ACPI_EC_HC_HID, .ids = ACPI_EC_HC_HID,
.ops = { .ops = {
......
...@@ -56,7 +56,7 @@ static int acpi_pci_link_add(struct acpi_device *device); ...@@ -56,7 +56,7 @@ static int acpi_pci_link_add(struct acpi_device *device);
static int acpi_pci_link_remove(struct acpi_device *device, int type); static int acpi_pci_link_remove(struct acpi_device *device, int type);
static struct acpi_driver acpi_pci_link_driver = { static struct acpi_driver acpi_pci_link_driver = {
.name = ACPI_PCI_LINK_DRIVER_NAME, .name = "pci_link",
.class = ACPI_PCI_LINK_CLASS, .class = ACPI_PCI_LINK_CLASS,
.ids = ACPI_PCI_LINK_HID, .ids = ACPI_PCI_LINK_HID,
.ops = { .ops = {
......
...@@ -46,7 +46,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type); ...@@ -46,7 +46,7 @@ static int acpi_pci_root_remove(struct acpi_device *device, int type);
static int acpi_pci_root_start(struct acpi_device *device); static int acpi_pci_root_start(struct acpi_device *device);
static struct acpi_driver acpi_pci_root_driver = { static struct acpi_driver acpi_pci_root_driver = {
.name = ACPI_PCI_ROOT_DRIVER_NAME, .name = "pci_root",
.class = ACPI_PCI_ROOT_CLASS, .class = ACPI_PCI_ROOT_CLASS,
.ids = ACPI_PCI_ROOT_HID, .ids = ACPI_PCI_ROOT_HID,
.ops = { .ops = {
......
...@@ -60,7 +60,7 @@ static int acpi_power_remove(struct acpi_device *device, int type); ...@@ -60,7 +60,7 @@ static int acpi_power_remove(struct acpi_device *device, int type);
static int acpi_power_open_fs(struct inode *inode, struct file *file); static int acpi_power_open_fs(struct inode *inode, struct file *file);
static struct acpi_driver acpi_power_driver = { static struct acpi_driver acpi_power_driver = {
.name = ACPI_POWER_DRIVER_NAME, .name = "power",
.class = ACPI_POWER_CLASS, .class = ACPI_POWER_CLASS,
.ids = ACPI_POWER_HID, .ids = ACPI_POWER_HID,
.ops = { .ops = {
......
...@@ -89,7 +89,7 @@ static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu); ...@@ -89,7 +89,7 @@ static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu);
static int acpi_processor_handle_eject(struct acpi_processor *pr); static int acpi_processor_handle_eject(struct acpi_processor *pr);
static struct acpi_driver acpi_processor_driver = { static struct acpi_driver acpi_processor_driver = {
.name = ACPI_PROCESSOR_DRIVER_NAME, .name = "processor",
.class = ACPI_PROCESSOR_CLASS, .class = ACPI_PROCESSOR_CLASS,
.ids = ACPI_PROCESSOR_HID, .ids = ACPI_PROCESSOR_HID,
.ops = { .ops = {
......
...@@ -110,7 +110,7 @@ static void acpi_battery_smbus_err_handler(struct acpi_ec_smbus *smbus); ...@@ -110,7 +110,7 @@ static void acpi_battery_smbus_err_handler(struct acpi_ec_smbus *smbus);
static void acpi_sbs_update_queue(void *data); static void acpi_sbs_update_queue(void *data);
static struct acpi_driver acpi_sbs_driver = { static struct acpi_driver acpi_sbs_driver = {
.name = ACPI_SBS_DRIVER_NAME, .name = "sbs",
.class = ACPI_SBS_CLASS, .class = ACPI_SBS_CLASS,
.ids = ACPI_SBS_HID, .ids = ACPI_SBS_HID,
.ops = { .ops = {
......
...@@ -98,7 +98,7 @@ static ssize_t acpi_thermal_write_polling(struct file *, const char __user *, ...@@ -98,7 +98,7 @@ static ssize_t acpi_thermal_write_polling(struct file *, const char __user *,
size_t, loff_t *); size_t, loff_t *);
static struct acpi_driver acpi_thermal_driver = { static struct acpi_driver acpi_thermal_driver = {
.name = ACPI_THERMAL_DRIVER_NAME, .name = "thermal",
.class = ACPI_THERMAL_CLASS, .class = ACPI_THERMAL_CLASS,
.ids = ACPI_THERMAL_HID, .ids = ACPI_THERMAL_HID,
.ops = { .ops = {
......
...@@ -75,7 +75,7 @@ static int acpi_video_bus_add(struct acpi_device *device); ...@@ -75,7 +75,7 @@ static int acpi_video_bus_add(struct acpi_device *device);
static int acpi_video_bus_remove(struct acpi_device *device, int type); static int acpi_video_bus_remove(struct acpi_device *device, int type);
static struct acpi_driver acpi_video_bus = { static struct acpi_driver acpi_video_bus = {
.name = ACPI_VIDEO_DRIVER_NAME, .name = "video",
.class = ACPI_VIDEO_CLASS, .class = ACPI_VIDEO_CLASS,
.ids = ACPI_VIDEO_HID, .ids = ACPI_VIDEO_HID,
.ops = { .ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment