diff options
author | Jesper Juhl <jj@chaosbits.net> | 2011-01-16 18:09:38 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-01-19 09:43:08 -0500 |
commit | 42b16b3fbb5ee4555f5dee6220f3ccaa6e1ebe47 (patch) | |
tree | 966c1266afca5dd0e59cace37f7cd49577bdf0e2 | |
parent | f0940cee222790e6e995a23f25c4ffb23f939a24 (diff) |
Kill off warning: ‘inline’ is not at beginning of declaration
Fix a bunch of
warning: ‘inline’ is not at beginning of declaration
messages when building a 'make allyesconfig' kernel with -Wextra.
These warnings are trivial to kill, yet rather annoying when building with
-Wextra.
The more we can cut down on pointless crap like this the better (IMHO).
A previous patch to do this for a 'allnoconfig' build has already been
merged. This just takes the cleanup a little further.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | arch/x86/oprofile/op_model_p4.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/btusb.c | 4 | ||||
-rw-r--r-- | drivers/cpuidle/sysfs.c | 2 | ||||
-rw-r--r-- | drivers/edac/i7300_edac.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/dir.c | 2 | ||||
-rw-r--r-- | kernel/trace/ring_buffer.c | 2 | ||||
-rw-r--r-- | net/ipv6/inet6_hashtables.c | 2 | ||||
-rw-r--r-- | net/mac80211/tx.c | 2 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0.h | 4 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 4 |
10 files changed, 13 insertions, 13 deletions
diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c index 9fadec074142..98ab13058f89 100644 --- a/arch/x86/oprofile/op_model_p4.c +++ b/arch/x86/oprofile/op_model_p4.c | |||
@@ -50,7 +50,7 @@ static inline void setup_num_counters(void) | |||
50 | #endif | 50 | #endif |
51 | } | 51 | } |
52 | 52 | ||
53 | static int inline addr_increment(void) | 53 | static inline int addr_increment(void) |
54 | { | 54 | { |
55 | #ifdef CONFIG_SMP | 55 | #ifdef CONFIG_SMP |
56 | return smp_num_siblings == 2 ? 2 : 1; | 56 | return smp_num_siblings == 2 ? 2 : 1; |
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 1da773f899a2..92d29bfa2f48 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -424,7 +424,7 @@ static void btusb_isoc_complete(struct urb *urb) | |||
424 | } | 424 | } |
425 | } | 425 | } |
426 | 426 | ||
427 | static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu) | 427 | static inline void __fill_isoc_descriptor(struct urb *urb, int len, int mtu) |
428 | { | 428 | { |
429 | int i, offset = 0; | 429 | int i, offset = 0; |
430 | 430 | ||
@@ -775,7 +775,7 @@ static void btusb_notify(struct hci_dev *hdev, unsigned int evt) | |||
775 | } | 775 | } |
776 | } | 776 | } |
777 | 777 | ||
778 | static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting) | 778 | static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting) |
779 | { | 779 | { |
780 | struct btusb_data *data = hdev->driver_data; | 780 | struct btusb_data *data = hdev->driver_data; |
781 | struct usb_interface *intf = data->isoc; | 781 | struct usb_interface *intf = data->isoc; |
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 0310ffaec9df..be7917ec40c9 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpuidle = { | |||
300 | .release = cpuidle_state_sysfs_release, | 300 | .release = cpuidle_state_sysfs_release, |
301 | }; | 301 | }; |
302 | 302 | ||
303 | static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i) | 303 | static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i) |
304 | { | 304 | { |
305 | kobject_put(&device->kobjs[i]->kobj); | 305 | kobject_put(&device->kobjs[i]->kobj); |
306 | wait_for_completion(&device->kobjs[i]->kobj_unregister); | 306 | wait_for_completion(&device->kobjs[i]->kobj_unregister); |
diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c index 05523b504271..76d1f576cdc8 100644 --- a/drivers/edac/i7300_edac.c +++ b/drivers/edac/i7300_edac.c | |||
@@ -162,7 +162,7 @@ static struct edac_pci_ctl_info *i7300_pci; | |||
162 | #define AMBPRESENT_0 0x64 | 162 | #define AMBPRESENT_0 0x64 |
163 | #define AMBPRESENT_1 0x66 | 163 | #define AMBPRESENT_1 0x66 |
164 | 164 | ||
165 | const static u16 mtr_regs[MAX_SLOTS] = { | 165 | static const u16 mtr_regs[MAX_SLOTS] = { |
166 | 0x80, 0x84, 0x88, 0x8c, | 166 | 0x80, 0x84, 0x88, 0x8c, |
167 | 0x82, 0x86, 0x8a, 0x8e | 167 | 0x82, 0x86, 0x8a, 0x8e |
168 | }; | 168 | }; |
diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index d417b3f9b0c7..f97b6f1c61dd 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c | |||
@@ -354,7 +354,7 @@ static inline int ocfs2_match(int len, | |||
354 | /* | 354 | /* |
355 | * Returns 0 if not found, -1 on failure, and 1 on success | 355 | * Returns 0 if not found, -1 on failure, and 1 on success |
356 | */ | 356 | */ |
357 | static int inline ocfs2_search_dirblock(struct buffer_head *bh, | 357 | static inline int ocfs2_search_dirblock(struct buffer_head *bh, |
358 | struct inode *dir, | 358 | struct inode *dir, |
359 | const char *name, int namelen, | 359 | const char *name, int namelen, |
360 | unsigned long offset, | 360 | unsigned long offset, |
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index bd1c35a4fbcc..6ee56b4ad136 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(struct list_head *list) | |||
669 | * the reader page). But if the next page is a header page, | 669 | * the reader page). But if the next page is a header page, |
670 | * its flags will be non zero. | 670 | * its flags will be non zero. |
671 | */ | 671 | */ |
672 | static int inline | 672 | static inline int |
673 | rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, | 673 | rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer, |
674 | struct buffer_page *page, struct list_head *list) | 674 | struct buffer_page *page, struct list_head *list) |
675 | { | 675 | { |
diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c index 633a6c266136..b53197233709 100644 --- a/net/ipv6/inet6_hashtables.c +++ b/net/ipv6/inet6_hashtables.c | |||
@@ -124,7 +124,7 @@ out: | |||
124 | } | 124 | } |
125 | EXPORT_SYMBOL(__inet6_lookup_established); | 125 | EXPORT_SYMBOL(__inet6_lookup_established); |
126 | 126 | ||
127 | static int inline compute_score(struct sock *sk, struct net *net, | 127 | static inline int compute_score(struct sock *sk, struct net *net, |
128 | const unsigned short hnum, | 128 | const unsigned short hnum, |
129 | const struct in6_addr *daddr, | 129 | const struct in6_addr *daddr, |
130 | const int dif) | 130 | const int dif) |
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5950e3abead9..a449dd508682 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr, | |||
173 | return cpu_to_le16(dur); | 173 | return cpu_to_le16(dur); |
174 | } | 174 | } |
175 | 175 | ||
176 | static int inline is_ieee80211_device(struct ieee80211_local *local, | 176 | static inline int is_ieee80211_device(struct ieee80211_local *local, |
177 | struct net_device *dev) | 177 | struct net_device *dev) |
178 | { | 178 | { |
179 | return local == wdev_priv(dev->ieee80211_ptr); | 179 | return local == wdev_priv(dev->ieee80211_ptr); |
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index cf46bba563cf..ecb8f4daf408 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h | |||
@@ -211,7 +211,7 @@ static void vortex_adbdma_startfifo(vortex_t * vortex, int adbdma); | |||
211 | //static void vortex_adbdma_stopfifo(vortex_t *vortex, int adbdma); | 211 | //static void vortex_adbdma_stopfifo(vortex_t *vortex, int adbdma); |
212 | static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma); | 212 | static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma); |
213 | static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma); | 213 | static void vortex_adbdma_resumefifo(vortex_t * vortex, int adbdma); |
214 | static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma); | 214 | static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma); |
215 | static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma); | 215 | static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma); |
216 | 216 | ||
217 | #ifndef CHIP_AU8810 | 217 | #ifndef CHIP_AU8810 |
@@ -219,7 +219,7 @@ static void vortex_wtdma_startfifo(vortex_t * vortex, int wtdma); | |||
219 | static void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma); | 219 | static void vortex_wtdma_stopfifo(vortex_t * vortex, int wtdma); |
220 | static void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma); | 220 | static void vortex_wtdma_pausefifo(vortex_t * vortex, int wtdma); |
221 | static void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma); | 221 | static void vortex_wtdma_resumefifo(vortex_t * vortex, int wtdma); |
222 | static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma); | 222 | static inline int vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma); |
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | /* global stuff. */ | 225 | /* global stuff. */ |
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 23f49f356e0f..d43252a08b58 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -1249,7 +1249,7 @@ static void vortex_adbdma_resetup(vortex_t *vortex, int adbdma) { | |||
1249 | } | 1249 | } |
1250 | } | 1250 | } |
1251 | 1251 | ||
1252 | static int inline vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma) | 1252 | static inline int vortex_adbdma_getlinearpos(vortex_t * vortex, int adbdma) |
1253 | { | 1253 | { |
1254 | stream_t *dma = &vortex->dma_adb[adbdma]; | 1254 | stream_t *dma = &vortex->dma_adb[adbdma]; |
1255 | int temp; | 1255 | int temp; |
@@ -1498,7 +1498,7 @@ static int vortex_wtdma_getcursubuffer(vortex_t * vortex, int wtdma) | |||
1498 | POS_SHIFT) & POS_MASK); | 1498 | POS_SHIFT) & POS_MASK); |
1499 | } | 1499 | } |
1500 | #endif | 1500 | #endif |
1501 | static int inline vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma) | 1501 | static inline int vortex_wtdma_getlinearpos(vortex_t * vortex, int wtdma) |
1502 | { | 1502 | { |
1503 | stream_t *dma = &vortex->dma_wt[wtdma]; | 1503 | stream_t *dma = &vortex->dma_wt[wtdma]; |
1504 | int temp; | 1504 | int temp; |