Skip to contentSkip to conversation

eth1394: remove an inline

PATCH In review Adrian Bunk 2 participants 2 messages Jul 13, 2004

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eth1394: remove an inline

Trying to compile drivers/ieee1394/eth1394.c with gcc 3.4 and

  # define inline         __inline__ __attribute__((always_inline))
results in the following compile error:

<-- snip -->

...
CC drivers/ieee1394/eth1394.o
drivers/ieee1394/eth1394.c: In function `eth1394_remove':
drivers/ieee1394/eth1394.c:189: sorry, unimplemented: inlining failed in call to 'purge_partial_datagram': function body not available drivers/ieee1394/eth1394.c:403: sorry, unimplemented: called from here make[2]: *** [drivers/ieee1394/eth1394.o] Error 1

<-- snip -->

The patch below removes the purge_partial_datagram inline from eth1394.c .

An alternative approach to removing the inline would be to move the function above the first function calling it.

diffstat output:

 drivers/ieee1394/eth1394.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/ieee1394/eth1394.c renamed from drivers/ieee1394/eth1394.c.old +2 -2
@@ -186,7 +186,7 @@
 					  unsigned char * haddr);
 static int ether1394_mac_addr(struct net_device *dev, void *p);
 
-static inline void purge_partial_datagram(struct list_head *old);
+static void purge_partial_datagram(struct list_head *old);
 static int ether1394_tx(struct sk_buff *skb, struct net_device *dev);
 static void ether1394_iso(struct hpsb_iso *iso);
 
@@ -1081,7 +1081,7 @@
 	return 0;
 }
 
-static inline void purge_partial_datagram(struct list_head *old)
+static void purge_partial_datagram(struct list_head *old)
 {
 	struct partial_datagram *pd = list_entry(old, struct partial_datagram, list);
 	struct list_head *lh, *n;
#1 lore raw
Quoted 14 lines · Adrian Bunk

Trying to compile drivers/ieee1394/eth1394.c with gcc 3.4 and

  # define inline         __inline__ __attribute__((always_inline))
results in the following compile error:

<-- snip -->

...
CC drivers/ieee1394/eth1394.o
drivers/ieee1394/eth1394.c: In function `eth1394_remove':
drivers/ieee1394/eth1394.c:189: sorry, unimplemented: inlining failed in call to 'purge_partial_datagram': function body not available drivers/ieee1394/eth1394.c:403: sorry, unimplemented: called from here make[2]: *** [drivers/ieee1394/eth1394.o] Error 1

Quoted 1 line

<-- snip -->

Thanks. Patch committed.

Signature · 1 line
Steve Kinneberg