macintosh/adb: Use C99 initializers for struct adb_driver instances

No change to object files.

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index 15db69d8ba697deb1426eff545c872c8bfc6e62d..ca623e6446e4cfa49ed3574e893a673dc232b148 100644 (file)
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -53,13 +53,13 @@ static void adb_iop_poll(void);
 static int adb_iop_reset_bus(void);
 
 struct adb_driver adb_iop_driver = {
-       "ISM IOP",
-       adb_iop_probe,
-       adb_iop_init,
-       adb_iop_send_request,
-       adb_iop_autopoll,
-       adb_iop_poll,
-       adb_iop_reset_bus
+       .name         = "ISM IOP",
+       .probe        = adb_iop_probe,
+       .init         = adb_iop_init,
+       .send_request = adb_iop_send_request,
+       .autopoll     = adb_iop_autopoll,
+       .poll         = adb_iop_poll,
+       .reset_bus    = adb_iop_reset_bus
 };
 
 static void adb_iop_end_req(struct adb_request *req, int state)

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 9a6223add30e6dfd3f2e2ec2efa42335a7bb1a77..eb3adfb7f88d36684b7fd4fe6a564a63f772d435 100644 (file)
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -70,14 +70,13 @@ static void macio_adb_poll(void);
 static int macio_adb_reset_bus(void);
 
 struct adb_driver macio_adb_driver = {
-       "MACIO",
-       macio_probe,
-       macio_init,
-       macio_send_request,
-       /*macio_write,*/
-       macio_adb_autopoll,
-       macio_adb_poll,
-       macio_adb_reset_bus
+       .name         = "MACIO",
+       .probe        = macio_probe,
+       .init         = macio_init,
+       .send_request = macio_send_request,
+       .autopoll     = macio_adb_autopoll,
+       .poll         = macio_adb_poll,
+       .reset_bus    = macio_adb_reset_bus,
 };
 
 int macio_probe(void)

diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index 4ba06a1695ea16fc2e02987f23213578f68dc890..cf6f7d52d6beef08a7ea9c15eff259f3578a17ed 100644 (file)
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -91,13 +91,13 @@ static void macii_poll(void);
 static int macii_reset_bus(void);
 
 struct adb_driver via_macii_driver = {
-       "Mac II",
-       macii_probe,
-       macii_init,
-       macii_send_request,
-       macii_autopoll,
-       macii_poll,
-       macii_reset_bus
+       .name         = "Mac II",
+       .probe        = macii_probe,
+       .init         = macii_init,
+       .send_request = macii_send_request,
+       .autopoll     = macii_autopoll,
+       .poll         = macii_poll,
+       .reset_bus    = macii_reset_bus,
 };
 
 static enum macii_state {

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index fc56c70677321fdccea9ccd95e9ace4f697f8504..433dbeddfcf9e28b31616af40e41912986a3b7c6 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -199,13 +199,13 @@ static const struct file_operations pmu_options_proc_fops;
 
 #ifdef CONFIG_ADB
 const struct adb_driver via_pmu_driver = {
-       "PMU",
-       pmu_probe,
-       pmu_init,
-       pmu_send_request,
-       pmu_adb_autopoll,
-       pmu_poll_adb,
-       pmu_adb_reset_bus
+       .name         = "PMU",
+       .probe        = pmu_probe,
+       .init         = pmu_init,
+       .send_request = pmu_send_request,
+       .autopoll     = pmu_adb_autopoll,
+       .poll         = pmu_poll_adb,
+       .reset_bus    = pmu_adb_reset_bus,
 };
 #endif /* CONFIG_ADB */
 

diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 25465fb91ec9bd246c08f42fd22e423f878f7dbe..de69369cdb2d0eb8266030f7663c451f5174248e 100644 (file)
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -119,13 +119,13 @@ static void pmu_enable_backlight(int on);
 static void pmu_set_brightness(int level);
 
 struct adb_driver via_pmu_driver = {
-       "68K PMU",
-       pmu_probe,
-       pmu_init,
-       pmu_send_request,
-       pmu_autopoll,
-       pmu_poll,
-       pmu_reset_bus
+       .name         = "68K PMU",
+       .probe        = pmu_probe,
+       .init         = pmu_init,
+       .send_request = pmu_send_request,
+       .autopoll     = pmu_autopoll,
+       .poll         = pmu_poll,
+       .reset_bus    = pmu_reset_bus,
 };
 
 /*