Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Finn Thain and committed by
Michael Ellerman
3a52f6f9 741de617

+35 -36
+7 -7
drivers/macintosh/adb-iop.c
··· 53 53 static int adb_iop_reset_bus(void); 54 54 55 55 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 63 63 }; 64 64 65 65 static void adb_iop_end_req(struct adb_request *req, int state)
+7 -8
drivers/macintosh/macio-adb.c
··· 70 70 static int macio_adb_reset_bus(void); 71 71 72 72 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, 81 80 }; 82 81 83 82 int macio_probe(void)
+7 -7
drivers/macintosh/via-macii.c
··· 91 91 static int macii_reset_bus(void); 92 92 93 93 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, 101 101 }; 102 102 103 103 static enum macii_state {
+7 -7
drivers/macintosh/via-pmu.c
··· 199 199 200 200 #ifdef CONFIG_ADB 201 201 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, 209 209 }; 210 210 #endif /* CONFIG_ADB */ 211 211
+7 -7
drivers/macintosh/via-pmu68k.c
··· 119 119 static void pmu_set_brightness(int level); 120 120 121 121 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, 129 129 }; 130 130 131 131 /*