more gcc3.4 inline fixes [4/10]
PATCH 1/1 more gcc3.4 inline fixes [4/10]
drivers/media/radio/radio-maestro.c renamed from drivers/media/radio/radio-maestro.c~ +24 -24
@@ -307,30 +307,6 @@video_unregister_device (&maestro_radio); } -int __init maestro_radio_init (void ) -{ - register__u16 found=0 ; -struct pci_dev *pcidev =NULL ; -if (!pci_present ()) -return -ENODEV ; -while (!found && (pcidev =pci_find_device (PCI_VENDOR_ESS , -PCI_DEVICE_ID_ESS_ESS1968 , - pcidev))) - found |=radio_install (pcidev); -while (!found && (pcidev =pci_find_device (PCI_VENDOR_ESS , -PCI_DEVICE_ID_ESS_ESS1978 , - pcidev))) - found |=radio_install (pcidev); -if (!found) { -printk (KERN_INFO "radio-maestro: no devices found.\n" ); -return -ENODEV ; - } -return 0 ; -} - -module_init (maestro_radio_init); -module_exit (maestro_radio_exit); -inline static __u16 radio_power_on (struct radio_device *dev) { register__u16 io=dev->io;
@@ -378,3 +354,27 @@return 0 ; } +int __init maestro_radio_init (void ) +{ + register__u16 found=0 ; +struct pci_dev *pcidev =NULL ; +if (!pci_present ()) +return -ENODEV ; +while (!found && (pcidev =pci_find_device (PCI_VENDOR_ESS , +PCI_DEVICE_ID_ESS_ESS1968 , + pcidev))) + found |=radio_install (pcidev); +while (!found && (pcidev =pci_find_device (PCI_VENDOR_ESS , +PCI_DEVICE_ID_ESS_ESS1978 , + pcidev))) + found |=radio_install (pcidev); +if (!found) { +printk (KERN_INFO "radio-maestro: no devices found.\n" ); +return -ENODEV ; + } +return 0 ; +} + +module_init (maestro_radio_init); +module_exit (maestro_radio_exit); +
drivers/media/video/w9966.c renamed from drivers/media/video/w9966.c~ +8 -8
@@ -691,6 +691,14 @@udelay (W9966_I2C_UDELAY ); } +// Get peripheral clock line +// Expects a claimed pdev. +static inline int w9966_i2c_getscl (struct w9966_dev * cam) +{ +const u8 pins =w9966_rreg (cam,0x18 ); +return ((pins &W9966_I2C_R_CLOCK ) >0 ); +} +// Sets the clock line on the i2c bus. // Expects a claimed pdev. // 1 on success, else 0
@@ -723,14 +731,6 @@return ((pins &W9966_I2C_R_DATA ) >0 ); } -// Get peripheral clock line -// Expects a claimed pdev. -static inline int w9966_i2c_getscl (struct w9966_dev * cam) -{ -const u8 pins =w9966_rreg (cam,0x18 ); -return ((pins &W9966_I2C_R_CLOCK ) >0 ); -} -// Write a byte with ack to the i2c bus. // Expects a claimed pdev. // 1 on success, else 0