radio-maestro.c: remove an inline (fwd)

FYI:
The patch forwarded below is still required in 2.6.8-rc2-mm1.

----- Forwarded message from Adrian Bunk <[email protected]> -----

Date: Tue, 13 Jul 2004 20:17:42 +0200
From: Adrian Bunk <[email protected]>
To: [email protected]
Cc: [email protected]
Subject: [2.6 patch] 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(-)

@@ -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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

----- End forwarded message -----