From: "O.Sezer" <sezeroz@ttnet.net.tr>
To: linux-kernel@vger.kernel.org
Cc: marcelo.tosatti@cyclades.com
Subject: [PATCH] [2.4.28-pre1] more gcc3.4 inline fixes [4/10]
Date: Tue, 17 Aug 2004 18:14:41 +0300 [thread overview]
Message-ID: <412220E1.7070702@ttnet.net.tr> (raw)
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: gcc34_inline_04.diff --]
[-- Type: text/plain, Size: 2493 bytes --]
--- 28p1/drivers/media/radio/radio-maestro.c~ 2001-09-30 22:26:06.000000000 +0300
+++ 28p1/drivers/media/radio/radio-maestro.c 2004-08-16 22:13:07.000000000 +0300
@@ -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);
+
--- 28p1/drivers/media/video/w9966.c~ 2003-06-13 17:51:34.000000000 +0300
+++ 28p1/drivers/media/video/w9966.c 2004-08-16 22:18:28.000000000 +0300
@@ -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
reply other threads:[~2004-08-17 15:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=412220E1.7070702@ttnet.net.tr \
--to=sezeroz@ttnet.net.tr \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo.tosatti@cyclades.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox