From 47d703e1d55f068c737c0c9f0c18f080fb08242b Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 30 Jan 2018 08:23:51 -0600 Subject: macintosh: Add module license to ans-lcd In kernel 4.15, the modprobe step on my PowerBook G4 started complaining that there was no module license for ans-lcd. Signed-off-by: Larry Finger Signed-off-by: Michael Ellerman --- drivers/macintosh/ans-lcd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/macintosh') diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c index 1de81d922d8a..c8e078b911c7 100644 --- a/drivers/macintosh/ans-lcd.c +++ b/drivers/macintosh/ans-lcd.c @@ -201,3 +201,4 @@ anslcd_exit(void) module_init(anslcd_init); module_exit(anslcd_exit); +MODULE_LICENSE("GPL v2"); -- cgit From 58935176ad17976b7a7f6ea25c0ceb2ca4308a30 Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Wed, 14 Feb 2018 22:15:18 +0100 Subject: powerpc/via-pmu: Fix section mismatch warning Make the struct via_pmu_driver const to avoid following warning: WARNING: vmlinux.o(.data+0x4739c): Section mismatch in reference from the variable via_pmu_driver to the function .init.text:pmu_init() The variable via_pmu_driver references the function __init pmu_init() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console Signed-off-by: Mathieu Malaterre Suggested-by: Laurent Vivier Reviewed-by: Laurent Vivier Signed-off-by: Michael Ellerman --- drivers/macintosh/via-pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/macintosh') diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 94c0f3f7df69..fc56c7067732 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -198,7 +198,7 @@ static const struct file_operations pmu_battery_proc_fops; static const struct file_operations pmu_options_proc_fops; #ifdef CONFIG_ADB -struct adb_driver via_pmu_driver = { +const struct adb_driver via_pmu_driver = { "PMU", pmu_probe, pmu_init, -- cgit From a0828cf57acce9bf941539e1f633e9a91f9df57d Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Thu, 19 Jan 2017 17:15:30 +0100 Subject: powerpc: Use sizeof(*foo) rather than sizeof(struct foo) It's slightly less error prone to use sizeof(*foo) rather than specifying the type. Signed-off-by: Markus Elfring [mpe: Consolidate into one patch, rewrite change log] Signed-off-by: Michael Ellerman --- drivers/macintosh/rack-meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/macintosh') diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 910b5b6f96b1..190c9efeace5 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c @@ -397,7 +397,7 @@ static int rackmeter_probe(struct macio_dev* mdev, } /* Create and initialize our instance data */ - rm = kzalloc(sizeof(struct rackmeter), GFP_KERNEL); + rm = kzalloc(sizeof(*rm), GFP_KERNEL); if (rm == NULL) { printk(KERN_ERR "rackmeter: failed to allocate memory !\n"); rc = -ENOMEM; -- cgit From 3a52f6f980c45b0dfa667f30d3ff034d033d260f Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Thu, 29 Mar 2018 11:36:04 +1100 Subject: macintosh/adb: Use C99 initializers for struct adb_driver instances No change to object files. Cc: Benjamin Herrenschmidt Signed-off-by: Finn Thain Signed-off-by: Michael Ellerman --- drivers/macintosh/adb-iop.c | 14 +++++++------- drivers/macintosh/macio-adb.c | 15 +++++++-------- drivers/macintosh/via-macii.c | 14 +++++++------- drivers/macintosh/via-pmu.c | 14 +++++++------- drivers/macintosh/via-pmu68k.c | 14 +++++++------- 5 files changed, 35 insertions(+), 36 deletions(-) (limited to 'drivers/macintosh') diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c index 15db69d8ba69..ca623e6446e4 100644 --- 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 9a6223add30e..eb3adfb7f88d 100644 --- 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 4ba06a1695ea..cf6f7d52d6be 100644 --- 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 fc56c7067732..433dbeddfcf9 100644 --- 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 25465fb91ec9..de69369cdb2d 100644 --- 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, }; /* -- cgit From e283655b5abe26462d53d5196f186c5e8863af3b Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Fri, 16 Mar 2018 22:17:28 +0200 Subject: drivers: macintosh: rack-meter: really fix bogus memsets We should zero an array using sizeof instead of number of elements. Fixes the following compiler (GCC 7.3.0) warnings: drivers/macintosh/rack-meter.c: In function 'rackmeter_do_pause': drivers/macintosh/rack-meter.c:157:2: warning: 'memset' used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size] drivers/macintosh/rack-meter.c:158:2: warning: 'memset' used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size] Fixes: 4f7bef7a9f69 ("drivers: macintosh: rack-meter: fix bogus memsets") Reported-by: Stephen Rothwell Signed-off-by: Aaro Koskinen Signed-off-by: Michael Ellerman --- drivers/macintosh/rack-meter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/macintosh') diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 190c9efeace5..1f29d2413c74 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c @@ -154,8 +154,8 @@ static void rackmeter_do_pause(struct rackmeter *rm, int pause) DBDMA_DO_STOP(rm->dma_regs); return; } - memset(rdma->buf1, 0, ARRAY_SIZE(rdma->buf1)); - memset(rdma->buf2, 0, ARRAY_SIZE(rdma->buf2)); + memset(rdma->buf1, 0, sizeof(rdma->buf1)); + memset(rdma->buf2, 0, sizeof(rdma->buf2)); rm->dma_buf_v->mark = 0; -- cgit