* [PATCH 1/3] ARM: rpc: ecard: use designated intializers
@ 2021-10-18 14:02 Arnd Bergmann
2021-10-18 14:02 ` [PATCH 2/3] ARM: rpc: ecard: fix unused-function warning Arnd Bergmann
2021-10-18 14:02 ` [PATCH 3/3] ARM: rpc: remove unused io-acorn.S Arnd Bergmann
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-10-18 14:02 UTC (permalink / raw)
To: Russell King; +Cc: linux-arm-kernel, Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
gcc-8 warns about the use of positional initializers:
arch/arm/mach-rpc/ecard.c:414:2: error: positional initialization of field in 'struct' declared with 'designated_init' attribute [-Werror=designated-init]
ecard_def_irq_enable,
Change to the designated initializer used elsewhere in the kernel.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-rpc/ecard.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index c30df1097c52..27df70013569 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -411,12 +411,12 @@ static int ecard_def_fiq_pending(ecard_t *ec)
}
static expansioncard_ops_t ecard_default_ops = {
- ecard_def_irq_enable,
- ecard_def_irq_disable,
- ecard_def_irq_pending,
- ecard_def_fiq_enable,
- ecard_def_fiq_disable,
- ecard_def_fiq_pending
+ .irqenable = ecard_def_irq_enable,
+ .irqdisable = ecard_def_irq_disable,
+ .irqpending = ecard_def_irq_pending,
+ .fiqenable = ecard_def_fiq_enable,
+ .fiqdisable = ecard_def_fiq_disable,
+ .fiqpending = ecard_def_fiq_pending
};
/*
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/3] ARM: rpc: ecard: fix unused-function warning
2021-10-18 14:02 [PATCH 1/3] ARM: rpc: ecard: use designated intializers Arnd Bergmann
@ 2021-10-18 14:02 ` Arnd Bergmann
2021-10-18 14:02 ` [PATCH 3/3] ARM: rpc: remove unused io-acorn.S Arnd Bergmann
1 sibling, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-10-18 14:02 UTC (permalink / raw)
To: Russell King; +Cc: linux-arm-kernel, Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
When CONFIG_PROC_FS is disabled, gcc warns about an
unused function:
arch/arm/mach-rpc/ecard.c:650:12: error: unused function 'ecard_devices_proc_show' [-Werror,-Wunused-function]
Mark it as __maybe_unused to avoid adding an extra #ifdef.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-rpc/ecard.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index 27df70013569..864b251282af 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -647,7 +647,7 @@ static int ecard_prints(struct seq_file *m, ecard_t *ec)
return 0;
}
-static int ecard_devices_proc_show(struct seq_file *m, void *v)
+static int __maybe_unused ecard_devices_proc_show(struct seq_file *m, void *v)
{
ecard_t *ec = cards;
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 3/3] ARM: rpc: remove unused io-acorn.S
2021-10-18 14:02 [PATCH 1/3] ARM: rpc: ecard: use designated intializers Arnd Bergmann
2021-10-18 14:02 ` [PATCH 2/3] ARM: rpc: ecard: fix unused-function warning Arnd Bergmann
@ 2021-10-18 14:02 ` Arnd Bergmann
1 sibling, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-10-18 14:02 UTC (permalink / raw)
To: Russell King; +Cc: linux-arm-kernel, Arnd Bergmann
From: Arnd Bergmann <arnd@arndb.de>
When CONFIG_PRINTK is disabled, this causes a link failure:
arm-linux-gnueabi-ld: arch/arm/mach-rpc/io-acorn.o: in function `outsl':
(.text+0x38): undefined reference to `_printk'
It appears like these functions have never actually had any
callers themselves and are not declared in a header, but were
copied from an early version of the ebsa110 platform.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-rpc/Makefile | 2 +-
arch/arm/mach-rpc/io-acorn.S | 28 ----------------------------
2 files changed, 1 insertion(+), 29 deletions(-)
delete mode 100644 arch/arm/mach-rpc/io-acorn.S
diff --git a/arch/arm/mach-rpc/Makefile b/arch/arm/mach-rpc/Makefile
index 90a645a18444..318e368022e3 100644
--- a/arch/arm/mach-rpc/Makefile
+++ b/arch/arm/mach-rpc/Makefile
@@ -5,5 +5,5 @@
# Object file lists.
-obj-y :=dma.o ecard.o ecard-loader.o fiq.o floppydma.o io-acorn.o irq.o \
+obj-y :=dma.o ecard.o ecard-loader.o fiq.o floppydma.o irq.o \
riscpc.o time.o
diff --git a/arch/arm/mach-rpc/io-acorn.S b/arch/arm/mach-rpc/io-acorn.S
deleted file mode 100644
index aa9bf0d771c0..000000000000
--- a/arch/arm/mach-rpc/io-acorn.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * linux/arch/arm/lib/io-acorn.S
- *
- * Copyright (C) 1995, 1996 Russell King
- *
- * 27/03/03 Ian Molton Clean up CONFIG_CPU
- */
-#include <linux/linkage.h>
-#include <linux/kern_levels.h>
-#include <asm/assembler.h>
-
- .text
- .align
-
-.Liosl_warning:
- .ascii KERN_WARNING "insl/outsl not implemented, called from %08lX\0"
- .align
-
-/*
- * These make no sense on Acorn machines.
- * Print a warning message.
- */
-ENTRY(insl)
-ENTRY(outsl)
- adr r0, .Liosl_warning
- mov r1, lr
- b _printk
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-18 14:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-18 14:02 [PATCH 1/3] ARM: rpc: ecard: use designated intializers Arnd Bergmann
2021-10-18 14:02 ` [PATCH 2/3] ARM: rpc: ecard: fix unused-function warning Arnd Bergmann
2021-10-18 14:02 ` [PATCH 3/3] ARM: rpc: remove unused io-acorn.S Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).