summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArt Haas <ahaas@airmail.net>2002-11-17 18:11:11 -0800
committerDavid S. Miller <davem@nuts.ninka.net>2002-11-17 18:11:11 -0800
commitd5ea0e7cbe0bd932a72aa76d8225e314cd13048a (patch)
treeb70fe3b1a650e92569109d4bf65bf6911a841055
parent4cc76cec3dac1c36bb3babc8064d2e3e1eb213bf (diff)
[PATCH] C99 initializers for drivers/pnp
-rw-r--r--drivers/pnp/driver.c4
-rw-r--r--drivers/pnp/isapnp/core.c8
-rw-r--r--drivers/pnp/isapnp/proc.c4
-rw-r--r--drivers/pnp/pnpbios/core.c42
4 files changed, 29 insertions, 29 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 69f22fea13c3..ca36bce2a5a5 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -143,8 +143,8 @@ static int pnp_bus_match(struct device *dev, struct device_driver *drv)
struct bus_type pnp_bus_type = {
- name: "pnp",
- match: pnp_bus_match,
+ .name = "pnp",
+ .match = pnp_bus_match,
};
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 635a07287dd5..0425e1583f1a 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -1055,10 +1055,10 @@ static int isapnp_disable_resources(struct pnp_dev *dev)
}
struct pnp_protocol isapnp_protocol = {
- name: "ISA Plug and Play",
- get: isapnp_get_resources,
- set: isapnp_set_resources,
- disable:isapnp_disable_resources,
+ .name = "ISA Plug and Play",
+ .get = isapnp_get_resources,
+ .set = isapnp_set_resources,
+ .disable = isapnp_disable_resources,
};
static inline int isapnp_init_device_tree(void)
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c
index a271c06eb930..e093441edaf4 100644
--- a/drivers/pnp/isapnp/proc.c
+++ b/drivers/pnp/isapnp/proc.c
@@ -88,8 +88,8 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char *buf, size_t nbytes,
static struct file_operations isapnp_proc_bus_file_operations =
{
- llseek: isapnp_proc_bus_lseek,
- read: isapnp_proc_bus_read,
+ .llseek = isapnp_proc_bus_lseek,
+ .read = isapnp_proc_bus_read,
};
static int isapnp_proc_attach_device(struct pnp_dev *dev)
diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index 8461b19f9ebd..f04524a48c29 100644
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -1293,29 +1293,29 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
struct pnp_cfg * config = kmalloc(sizeof(struct pnp_cfg), GFP_KERNEL);
/* first we need to set everything to a disabled value */
struct pnp_port port = {
- max: 0,
- min: 0,
- align: 0,
- size: 0,
- flags: 0,
- pad: 0,
+ .max = 0,
+ .min = 0,
+ .align = 0,
+ .size = 0,
+ .flags = 0,
+ .pad = 0,
};
struct pnp_mem mem = {
- max: 0,
- min: 0,
- align: 0,
- size: 0,
- flags: 0,
- pad: 0,
+ .max = 0,
+ .min = 0,
+ .align = 0,
+ .size = 0,
+ .flags = 0,
+ .pad = 0,
};
struct pnp_dma dma = {
- map: 0,
- flags: 0,
+ .map = 0,
+ .flags = 0,
};
struct pnp_irq irq = {
- map: 0,
- flags: 0,
- pad: 0,
+ .map = 0,
+ .flags = 0,
+ .pad = 0,
};
int i;
struct pnp_dev_node_info node_info;
@@ -1358,10 +1358,10 @@ static int pnpbios_disable_resources(struct pnp_dev *dev)
/* PnP Layer support */
static struct pnp_protocol pnpbios_protocol = {
- name: "Plug and Play BIOS",
- get: pnpbios_get_resources,
- set: pnpbios_set_resources,
- disable:pnpbios_disable_resources,
+ .name = "Plug and Play BIOS",
+ .get = pnpbios_get_resources,
+ .set = pnpbios_set_resources,
+ .disable = pnpbios_disable_resources,
};
static int inline insert_device(struct pnp_dev *dev)