Skip to contentSkip to conversation

gpib: use 'static inline' instead of 'extern inline'

PATCH New Arnd Bergmann 1 participant 1 message Jun 11 GPIB drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpib: use 'static inline' instead of 'extern inline'

From: Arnd Bergmann <[email protected]>

With GNU inline semantics, an 'extern inline' function is only included in the build if it can be inlined. When the compiler for some reason decides against inlining it, this causes a link failure, as observed in one function in the tnt4882_gpib driver:

ld.lld: error: undefined symbol: mite_irq

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by tnt4882_gpib.c:974 (/home/arnd/arm-soc/drivers/gpib/tnt4882/tnt4882_gpib.c:974)

              drivers/gpib/tnt4882/tnt4882_gpib.o:(ni_pci_attach) in archive vmlinux.a

Change all of the 'extern inline' definitions in gpib to the regular 'static inline' to avoid this.

Fixes 0cd5b05551e0 ("staging: gpib: Add TNT4882 chip based GPIB driver")
Fixes 6c52d5e3cde2 ("staging: gpib: Add common include files for GPIB drivers")
---
 drivers/gpib/include/amccs5933.h | 10 +++++-----
 drivers/gpib/tnt4882/mite.h      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
drivers/gpib/include/amccs5933.h +5 -5
index d7f63c795096..f8a80bdc70dc 100644
@@ -13,7 +13,7 @@ enum {
 };
 
 // incoming mailbox 0-3  register offsets
-extern inline int INCOMING_MAILBOX_REG(unsigned int mailbox)
+static inline int INCOMING_MAILBOX_REG(unsigned int mailbox)
 {
 	return (0x10 + 4 * mailbox);
 };
@@ -29,25 +29,25 @@ enum {
 };
 
 // select byte 0 to 3 of incoming mailbox
-extern inline int INBOX_BYTE_BITS(unsigned int byte)
+static inline int INBOX_BYTE_BITS(unsigned int byte)
 {
 	return (byte & 0x3) << 8;
 };
 
 // select incoming mailbox 0 to 3
-extern inline int INBOX_SELECT_BITS(unsigned int mailbox)
+static inline int INBOX_SELECT_BITS(unsigned int mailbox)
 {
 	return (mailbox & 0x3) << 10;
 };
 
 // select byte 0 to 3 of outgoing mailbox
-extern inline int OUTBOX_BYTE_BITS(unsigned int byte)
+static inline int OUTBOX_BYTE_BITS(unsigned int byte)
 {
 	return (byte & 0x3);
 };
 
 // select outgoing mailbox 0 to 3
-extern inline int OUTBOX_SELECT_BITS(unsigned int mailbox)
+static inline int OUTBOX_SELECT_BITS(unsigned int mailbox)
 {
 	return (mailbox & 0x3) << 2;
 };
drivers/gpib/tnt4882/mite.h +2 -2
index a1fdba9672a0..dd251afa90e3 100644
@@ -45,12 +45,12 @@ struct mite_struct {
 
 extern struct mite_struct *mite_devices;
 
-extern inline unsigned int mite_irq(struct mite_struct *mite)
+static inline unsigned int mite_irq(struct mite_struct *mite)
 {
 	return mite->pcidev->irq;
 };
 
-extern inline unsigned int mite_device_id(struct mite_struct *mite)
+static inline unsigned int mite_device_id(struct mite_struct *mite)
 {
 	return mite->pcidev->device;
 };
Signature · 1 line
2.39.5