Skip to content

Commit 3a52f6f

Browse files
Finn Thainmpe
authored andcommitted
macintosh/adb: Use C99 initializers for struct adb_driver instances
No change to object files. Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Finn Thain <[email protected]> Signed-off-by: Michael Ellerman <[email protected]>
1 parent 741de61 commit 3a52f6f

File tree

5 files changed

+35
-36
lines changed

5 files changed

+35
-36
lines changed

drivers/macintosh/adb-iop.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ static void adb_iop_poll(void);
5353
static int adb_iop_reset_bus(void);
5454

5555
struct adb_driver adb_iop_driver = {
56-
"ISM IOP",
57-
adb_iop_probe,
58-
adb_iop_init,
59-
adb_iop_send_request,
60-
adb_iop_autopoll,
61-
adb_iop_poll,
62-
adb_iop_reset_bus
56+
.name = "ISM IOP",
57+
.probe = adb_iop_probe,
58+
.init = adb_iop_init,
59+
.send_request = adb_iop_send_request,
60+
.autopoll = adb_iop_autopoll,
61+
.poll = adb_iop_poll,
62+
.reset_bus = adb_iop_reset_bus
6363
};
6464

6565
static void adb_iop_end_req(struct adb_request *req, int state)

drivers/macintosh/macio-adb.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,13 @@ static void macio_adb_poll(void);
7070
static int macio_adb_reset_bus(void);
7171

7272
struct adb_driver macio_adb_driver = {
73-
"MACIO",
74-
macio_probe,
75-
macio_init,
76-
macio_send_request,
77-
/*macio_write,*/
78-
macio_adb_autopoll,
79-
macio_adb_poll,
80-
macio_adb_reset_bus
73+
.name = "MACIO",
74+
.probe = macio_probe,
75+
.init = macio_init,
76+
.send_request = macio_send_request,
77+
.autopoll = macio_adb_autopoll,
78+
.poll = macio_adb_poll,
79+
.reset_bus = macio_adb_reset_bus,
8180
};
8281

8382
int macio_probe(void)

drivers/macintosh/via-macii.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ static void macii_poll(void);
9191
static int macii_reset_bus(void);
9292

9393
struct adb_driver via_macii_driver = {
94-
"Mac II",
95-
macii_probe,
96-
macii_init,
97-
macii_send_request,
98-
macii_autopoll,
99-
macii_poll,
100-
macii_reset_bus
94+
.name = "Mac II",
95+
.probe = macii_probe,
96+
.init = macii_init,
97+
.send_request = macii_send_request,
98+
.autopoll = macii_autopoll,
99+
.poll = macii_poll,
100+
.reset_bus = macii_reset_bus,
101101
};
102102

103103
static enum macii_state {

drivers/macintosh/via-pmu.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,13 @@ static const struct file_operations pmu_options_proc_fops;
199199

200200
#ifdef CONFIG_ADB
201201
const struct adb_driver via_pmu_driver = {
202-
"PMU",
203-
pmu_probe,
204-
pmu_init,
205-
pmu_send_request,
206-
pmu_adb_autopoll,
207-
pmu_poll_adb,
208-
pmu_adb_reset_bus
202+
.name = "PMU",
203+
.probe = pmu_probe,
204+
.init = pmu_init,
205+
.send_request = pmu_send_request,
206+
.autopoll = pmu_adb_autopoll,
207+
.poll = pmu_poll_adb,
208+
.reset_bus = pmu_adb_reset_bus,
209209
};
210210
#endif /* CONFIG_ADB */
211211

drivers/macintosh/via-pmu68k.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ static void pmu_enable_backlight(int on);
119119
static void pmu_set_brightness(int level);
120120

121121
struct adb_driver via_pmu_driver = {
122-
"68K PMU",
123-
pmu_probe,
124-
pmu_init,
125-
pmu_send_request,
126-
pmu_autopoll,
127-
pmu_poll,
128-
pmu_reset_bus
122+
.name = "68K PMU",
123+
.probe = pmu_probe,
124+
.init = pmu_init,
125+
.send_request = pmu_send_request,
126+
.autopoll = pmu_autopoll,
127+
.poll = pmu_poll,
128+
.reset_bus = pmu_reset_bus,
129129
};
130130

131131
/*

0 commit comments

Comments
 (0)