summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Grover <agrover@acpi3.(none)>2002-07-24 23:59:23 -0700
committerAndy Grover <agrover@acpi3.(none)>2002-07-24 23:59:23 -0700
commit4916e11805b7e1ed5abddbca71ff36b752e2c470 (patch)
tree03387a1b2d729b42abd61bca5d2a6ddfa64137dc
parent6050790ee84d7e4d7aa95a3490c4a082daf8f38e (diff)
Use C99 initializers (Rusty Russell)
-rw-r--r--drivers/acpi/ac.c16
-rw-r--r--drivers/acpi/battery.c16
-rw-r--r--drivers/acpi/bus.c10
-rw-r--r--drivers/acpi/button.c16
-rw-r--r--drivers/acpi/fan.c16
-rw-r--r--drivers/acpi/pci_irq.c2
-rw-r--r--drivers/acpi/pci_link.c16
-rw-r--r--drivers/acpi/pci_root.c16
-rw-r--r--drivers/acpi/power.c16
-rw-r--r--drivers/acpi/processor.c16
-rw-r--r--drivers/acpi/system.c36
-rw-r--r--drivers/acpi/thermal.c16
12 files changed, 96 insertions, 96 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index c98eefa44766..c9faecf0e450 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -1,5 +1,5 @@
/*
- * acpi_ac.c - ACPI AC Adapter Driver ($Revision: 26 $)
+ * acpi_ac.c - ACPI AC Adapter Driver ($Revision: 27 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -47,13 +47,13 @@ int acpi_ac_add (struct acpi_device *device);
int acpi_ac_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_ac_driver = {
- name: ACPI_AC_DRIVER_NAME,
- class: ACPI_AC_CLASS,
- ids: ACPI_AC_HID,
- ops: {
- add: acpi_ac_add,
- remove: acpi_ac_remove,
- },
+ .name = ACPI_AC_DRIVER_NAME,
+ .class = ACPI_AC_CLASS,
+ .ids = ACPI_AC_HID,
+ .ops = {
+ .add = acpi_ac_add,
+ .remove = acpi_ac_remove,
+ },
};
struct acpi_ac {
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 6684da84decd..6a096d8c1463 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1,5 +1,5 @@
/*
- * acpi_battery.c - ACPI Battery Driver ($Revision: 36 $)
+ * acpi_battery.c - ACPI Battery Driver ($Revision: 37 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -52,13 +52,13 @@ static int acpi_battery_add (struct acpi_device *device);
static int acpi_battery_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_battery_driver = {
- name: ACPI_BATTERY_DRIVER_NAME,
- class: ACPI_BATTERY_CLASS,
- ids: ACPI_BATTERY_HID,
- ops: {
- add: acpi_battery_add,
- remove: acpi_battery_remove,
- },
+ .name = ACPI_BATTERY_DRIVER_NAME,
+ .class = ACPI_BATTERY_CLASS,
+ .ids = ACPI_BATTERY_HID,
+ .ops = {
+ .add = acpi_battery_add,
+ .remove = acpi_battery_remove,
+ },
};
struct acpi_battery_status {
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 900cbe0de6b2..881d02a7c5c7 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -1,5 +1,5 @@
/*
- * acpi_bus.c - ACPI Bus Driver ($Revision: 79 $)
+ * acpi_bus.c - ACPI Bus Driver ($Revision: 80 $)
*
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
*
@@ -97,10 +97,10 @@ static int acpi_device_suspend(struct device *dev, u32 state, u32 stage);
static int acpi_device_resume(struct device *dev, u32 stage);
static struct device_driver acpi_bus_driver = {
- probe: acpi_device_probe,
- remove: acpi_device_remove,
- suspend: acpi_device_suspend,
- resume: acpi_device_resume,
+ .probe = acpi_device_probe,
+ .remove = acpi_device_remove,
+ .suspend = acpi_device_suspend,
+ .resume = acpi_device_resume,
};
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index 5beed76b3dd3..cdd6c926ea5c 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -1,5 +1,5 @@
/*
- * acpi_button.c - ACPI Button Driver ($Revision: 29 $)
+ * acpi_button.c - ACPI Button Driver ($Revision: 30 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -47,13 +47,13 @@ int acpi_button_add (struct acpi_device *device);
int acpi_button_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_button_driver = {
- name: ACPI_BUTTON_DRIVER_NAME,
- class: ACPI_BUTTON_CLASS,
- ids: "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E",
- ops: {
- add: acpi_button_add,
- remove: acpi_button_remove,
- },
+ .name = ACPI_BUTTON_DRIVER_NAME,
+ .class = ACPI_BUTTON_CLASS,
+ .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E",
+ .ops = {
+ .add = acpi_button_add,
+ .remove = acpi_button_remove,
+ },
};
struct acpi_button {
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 3429bbf111be..3b3c728d3eac 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -1,5 +1,5 @@
/*
- * acpi_fan.c - ACPI Fan Driver ($Revision: 28 $)
+ * acpi_fan.c - ACPI Fan Driver ($Revision: 29 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -47,13 +47,13 @@ int acpi_fan_add (struct acpi_device *device);
int acpi_fan_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_fan_driver = {
- name: ACPI_FAN_DRIVER_NAME,
- class: ACPI_FAN_CLASS,
- ids: ACPI_FAN_HID,
- ops: {
- add: acpi_fan_add,
- remove: acpi_fan_remove,
- },
+ .name = ACPI_FAN_DRIVER_NAME,
+ .class = ACPI_FAN_CLASS,
+ .ids = ACPI_FAN_HID,
+ .ops = {
+ .add = acpi_fan_add,
+ .remove = acpi_fan_remove,
+ },
};
struct acpi_fan {
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index a2b1cd595057..5d5edb42f24c 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -1,5 +1,5 @@
/*
- * pci_irq.c - ACPI PCI Interrupt Routing ($Revision: 10 $)
+ * pci_irq.c - ACPI PCI Interrupt Routing ($Revision: 11 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 2320a8e016bd..b94b85b1cea4 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -1,5 +1,5 @@
/*
- * pci_link.c - ACPI PCI Interrupt Link Device Driver ($Revision: 33 $)
+ * pci_link.c - ACPI PCI Interrupt Link Device Driver ($Revision: 34 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -54,13 +54,13 @@ static int acpi_pci_link_add (struct acpi_device *device);
static int acpi_pci_link_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_pci_link_driver = {
- name: ACPI_PCI_LINK_DRIVER_NAME,
- class: ACPI_PCI_LINK_CLASS,
- ids: ACPI_PCI_LINK_HID,
- ops: {
- add: acpi_pci_link_add,
- remove: acpi_pci_link_remove,
- },
+ .name = ACPI_PCI_LINK_DRIVER_NAME,
+ .class = ACPI_PCI_LINK_CLASS,
+ .ids = ACPI_PCI_LINK_HID,
+ .ops = {
+ .add = acpi_pci_link_add,
+ .remove = acpi_pci_link_remove,
+ },
};
struct acpi_pci_link_irq {
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 7fef16be6d47..a56fedea61b4 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -1,5 +1,5 @@
/*
- * pci_root.c - ACPI PCI Root Bridge Driver ($Revision: 39 $)
+ * pci_root.c - ACPI PCI Root Bridge Driver ($Revision: 40 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -47,13 +47,13 @@ static int acpi_pci_root_add (struct acpi_device *device);
static int acpi_pci_root_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_pci_root_driver = {
- name: ACPI_PCI_ROOT_DRIVER_NAME,
- class: ACPI_PCI_ROOT_CLASS,
- ids: ACPI_PCI_ROOT_HID,
- ops: {
- add: acpi_pci_root_add,
- remove: acpi_pci_root_remove,
- },
+ .name = ACPI_PCI_ROOT_DRIVER_NAME,
+ .class = ACPI_PCI_ROOT_CLASS,
+ .ids = ACPI_PCI_ROOT_HID,
+ .ops = {
+ .add = acpi_pci_root_add,
+ .remove = acpi_pci_root_remove,
+ },
};
struct acpi_pci_root {
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 5e4f55dbfc90..986ebd729528 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -1,5 +1,5 @@
/*
- * acpi_power.c - ACPI Bus Power Management ($Revision: 38 $)
+ * acpi_power.c - ACPI Bus Power Management ($Revision: 39 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -43,13 +43,13 @@ int acpi_power_add (struct acpi_device *device);
int acpi_power_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_power_driver = {
- name: ACPI_POWER_DRIVER_NAME,
- class: ACPI_POWER_CLASS,
- ids: ACPI_POWER_HID,
- ops: {
- add: acpi_power_add,
- remove: acpi_power_remove,
- },
+ .name = ACPI_POWER_DRIVER_NAME,
+ .class = ACPI_POWER_CLASS,
+ .ids = ACPI_POWER_HID,
+ .ops = {
+ .add = acpi_power_add,
+ .remove = acpi_power_remove,
+ },
};
struct acpi_power_resource
diff --git a/drivers/acpi/processor.c b/drivers/acpi/processor.c
index 028ee228dcb0..933251d46b19 100644
--- a/drivers/acpi/processor.c
+++ b/drivers/acpi/processor.c
@@ -1,5 +1,5 @@
/*
- * acpi_processor.c - ACPI Processor Driver ($Revision: 69 $)
+ * acpi_processor.c - ACPI Processor Driver ($Revision: 71 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -78,13 +78,13 @@ static int acpi_processor_add (struct acpi_device *device);
static int acpi_processor_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_processor_driver = {
- name: ACPI_PROCESSOR_DRIVER_NAME,
- class: ACPI_PROCESSOR_CLASS,
- ids: ACPI_PROCESSOR_HID,
- ops: {
- add: acpi_processor_add,
- remove: acpi_processor_remove,
- },
+ .name = ACPI_PROCESSOR_DRIVER_NAME,
+ .class = ACPI_PROCESSOR_CLASS,
+ .ids = ACPI_PROCESSOR_HID,
+ .ops = {
+ .add = acpi_processor_add,
+ .remove = acpi_processor_remove,
+ },
};
/* Power Management */
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c
index 1bd1555510b0..bfd02982e234 100644
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
@@ -1,5 +1,5 @@
/*
- * acpi_system.c - ACPI System Driver ($Revision: 60 $)
+ * acpi_system.c - ACPI System Driver ($Revision: 63 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -63,13 +63,13 @@ static int acpi_system_add (struct acpi_device *device);
static int acpi_system_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_system_driver = {
- name: ACPI_SYSTEM_DRIVER_NAME,
- class: ACPI_SYSTEM_CLASS,
- ids: ACPI_SYSTEM_HID,
- ops: {
- add: acpi_system_add,
- remove: acpi_system_remove
- },
+ .name = ACPI_SYSTEM_DRIVER_NAME,
+ .class = ACPI_SYSTEM_CLASS,
+ .ids = ACPI_SYSTEM_HID,
+ .ops = {
+ .add = acpi_system_add,
+ .remove = acpi_system_remove
+ },
};
struct acpi_system
@@ -383,10 +383,10 @@ static unsigned int acpi_system_poll_event(struct file *file, poll_table *wait);
static struct file_operations acpi_system_event_ops = {
- open: acpi_system_open_event,
- read: acpi_system_read_event,
- release: acpi_system_close_event,
- poll: acpi_system_poll_event,
+ .open = acpi_system_open_event,
+ .read = acpi_system_read_event,
+ .release = acpi_system_close_event,
+ .poll = acpi_system_poll_event,
};
static int
@@ -479,7 +479,7 @@ acpi_system_poll_event(
static ssize_t acpi_system_read_dsdt (struct file*, char*, size_t, loff_t*);
static struct file_operations acpi_system_dsdt_ops = {
- read: acpi_system_read_dsdt,
+ .read = acpi_system_read_dsdt,
};
static ssize_t
@@ -522,7 +522,7 @@ acpi_system_read_dsdt (
static ssize_t acpi_system_read_fadt (struct file*, char*, size_t, loff_t*);
static struct file_operations acpi_system_fadt_ops = {
- read: acpi_system_read_fadt,
+ .read = acpi_system_read_fadt,
};
static ssize_t
@@ -1165,15 +1165,15 @@ acpi_system_remove_fs (
/* Simple wrapper calling power down function. */
static void acpi_sysrq_power_off(int key, struct pt_regs *pt_regs,
- struct tty_struct *tty)
+ struct tty_struct *tty)
{
acpi_power_off();
}
struct sysrq_key_op sysrq_acpi_poweroff_op = {
- handler: &acpi_sysrq_power_off,
- help_msg: "Off",
- action_msg: "Power Off\n"
+ .handler = &acpi_sysrq_power_off,
+ .help_msg = "Off",
+ .action_msg = "Power Off\n"
};
#endif /* CONFIG_MAGIC_SYSRQ */
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 0836b31843ca..bf5521e3403f 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1,5 +1,5 @@
/*
- * acpi_thermal.c - ACPI Thermal Zone Driver ($Revision: 40 $)
+ * acpi_thermal.c - ACPI Thermal Zone Driver ($Revision: 41 $)
*
* Copyright (C) 2001, 2002 Andy Grover <andrew.grover@intel.com>
* Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -65,13 +65,13 @@ static int acpi_thermal_add (struct acpi_device *device);
static int acpi_thermal_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_thermal_driver = {
- name: ACPI_THERMAL_DRIVER_NAME,
- class: ACPI_THERMAL_CLASS,
- ids: ACPI_THERMAL_HID,
- ops: {
- add: acpi_thermal_add,
- remove: acpi_thermal_remove,
- },
+ .name = ACPI_THERMAL_DRIVER_NAME,
+ .class = ACPI_THERMAL_CLASS,
+ .ids = ACPI_THERMAL_HID,
+ .ops = {
+ .add = acpi_thermal_add,
+ .remove = acpi_thermal_remove,
+ },
};
struct acpi_thermal_state {