Skip to contentSkip to conversation

radio-maestro.c: remove an inline

PATCH New Adrian Bunk 1 participant 1 message Jul 13, 2004 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 radio-maestro.c: remove an inline

Trying to compile drivers/media/radio/radio-maestro.c with gcc 3.4 and

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

<-- snip -->

...
CC drivers/media/radio/radio-maestro.o
drivers/media/radio/radio-maestro.c: In function `maestro_radio_init':
drivers/media/radio/radio-maestro.c:273: sorry, unimplemented: inlining failed in call to 'radio_install': function body not available drivers/media/radio/radio-maestro.c:291: sorry, unimplemented: called from here drivers/media/radio/radio-maestro.c:273: sorry, unimplemented: inlining failed in call to 'radio_install': function body not available drivers/media/radio/radio-maestro.c:295: sorry, unimplemented: called from here make[3]: *** [drivers/media/radio/radio-maestro.o] Error 1

<-- snip -->

The patch below removes the radio_install inline from radio-maestro.c.

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

 drivers/media/radio/radio-maestro.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/media/radio/radio-maestro.c renamed from drivers/media/radio/radio-maestro.c.old +2 -2
@@ -270,7 +270,7 @@
 	return ret;
 }
 
-inline static __u16 radio_install(struct pci_dev *pcidev);
+static __u16 radio_install(struct pci_dev *pcidev);
 
 MODULE_AUTHOR("Adam Tlalka, [email protected]");
 MODULE_DESCRIPTION("Radio driver for the Maestro PCI sound card radio.");
@@ -324,7 +324,7 @@
 	return (ofreq == radio_bits_get(dev));
 }
 
-inline static __u16 radio_install(struct pci_dev *pcidev)
+static __u16 radio_install(struct pci_dev *pcidev)
 {
 	if(((pcidev->class >> 8) & 0xffff) != PCI_CLASS_MULTIMEDIA_AUDIO)
 		return 0;