Fix up numerous '`xxxxx' is not at beginning of declaration' style warnings.

diff --git a/arch/i386/kernel/cpu/mcheck/p4.c b/arch/i386/kernel/cpu/mcheck/p4.c
index 903fac8e52c328b43b1e13ec79adc82bdd4809da..044aab612f666c870c39ace904a21ca8a8beba0f 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/p4.c
+++ b/arch/i386/kernel/cpu/mcheck/p4.c
@@ -123,7 +123,7 @@ static void __init intel_init_thermal(struct cpuinfo_x86 *c)
 
 
 /* P4/Xeon Extended MCE MSR retrieval, return 0 if unsupported */
-static int inline intel_get_extended_msrs(struct intel_mce_extended_msrs *r)
+static inline int intel_get_extended_msrs(struct intel_mce_extended_msrs *r)
 {
        u32 h;
 

diff --git a/arch/i386/kernel/smp.c b/arch/i386/kernel/smp.c
index c69963ca6bc7f5127cee0033edca88809b4425a2..3f42c6e3f011815830105923c326ceff4d326785 100644 (file)
--- a/arch/i386/kernel/smp.c
+++ b/arch/i386/kernel/smp.c
@@ -251,7 +251,7 @@ static spinlock_t tlbstate_lock = SPIN_LOCK_UNLOCKED;
  * We need to reload %cr3 since the page tables may be going
  * away from under us..
  */
-static void inline leave_mm (unsigned long cpu)
+static inline void leave_mm (unsigned long cpu)
 {
        if (cpu_tlbstate[cpu].state == TLBSTATE_OK)
                BUG();

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 063728add94e9e0ea4cde983739f93f14ebd7411..c028ac4ab667c89d243b25b73f8d179dc1c57a37 100644 (file)
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -317,7 +317,7 @@ static inline unsigned long get_cr2(void)
        return address;
 }
 
-static void inline do_trap(int trapnr, int signr, char *str, int vm86,
+static inline void do_trap(int trapnr, int signr, char *str, int vm86,
                           struct pt_regs * regs, long error_code, siginfo_t *info)
 {
        if (vm86 && regs->eflags & VM_MASK)

diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c
index a6355ae320fd65ecb6ac927700a3b478b3d091e9..fe3569203ce6dac89010f9b783993587936a5030 100644 (file)
--- a/arch/i386/mach-voyager/voyager_smp.c
+++ b/arch/i386/mach-voyager/voyager_smp.c
@@ -862,7 +862,7 @@ static spinlock_t tlbstate_lock = SPIN_LOCK_UNLOCKED;
  * We need to reload %cr3 since the page tables may be going
  * away from under us..
  */
-static void inline 
+static inline void
 leave_mm (unsigned long cpu)
 {
        if (cpu_tlbstate[cpu].state == TLBSTATE_OK)

diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index c7c5640a7d615f16f707a4730cd865c7df2d3d66..56f06e90f72f40c56cbd61f5cec2fb35a450efb5 100644 (file)
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -326,7 +326,7 @@ static long last_rtc_update;
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static void inline
+static inline void
 timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
        volatile unsigned char dummy;

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index bef2f248725fb2ee78163fc18a7a701a36ac0b9d..16c299115e3534b10d6eee286e70ce59e106cb35 100644 (file)
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -285,7 +285,7 @@ badframe:
        force_sig(SIGSEGV, current);
 }
 
-static int inline
+static inline int
 setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
 {
        int owned_fp;

diff --git a/arch/mips/sgi/kernel/reset.c b/arch/mips/sgi/kernel/reset.c
index c4e6ac1d18872644585c92de27b24616b9380630..e636497beaf25d004f978b23a32205128df13774 100644 (file)
--- a/arch/mips/sgi/kernel/reset.c
+++ b/arch/mips/sgi/kernel/reset.c
@@ -126,7 +126,7 @@ static inline void power_button(void)
        add_timer(&power_timer);
 }
 
-void inline sgi_volume_set(unsigned char volume)
+inline void sgi_volume_set(unsigned char volume)
 {
        sgi_volume = volume;
 
@@ -134,7 +134,7 @@ void inline sgi_volume_set(unsigned char volume)
        hpc3c0->pbus_extregs[2][1] = sgi_volume;
 }
 
-void inline sgi_volume_get(unsigned char *volume)
+inline void sgi_volume_get(unsigned char *volume)
 {
        *volume = sgi_volume;
 }

diff --git a/arch/mips64/kernel/signal.c b/arch/mips64/kernel/signal.c
index d96be2439680bc9f3e59108e10c6f9e936539370..1d83873421572d0dde48c2109ab4f0014f9850d4 100644 (file)
--- a/arch/mips64/kernel/signal.c
+++ b/arch/mips64/kernel/signal.c
@@ -344,7 +344,7 @@ badframe:
        force_sig(SIGSEGV, current);
 }
 
-static int inline setup_sigcontext(struct pt_regs *regs,
+static inline int setup_sigcontext(struct pt_regs *regs,
                                   struct sigcontext *sc)
 {
        int err = 0;

diff --git a/arch/mips64/kernel/signal32.c b/arch/mips64/kernel/signal32.c
index 98052bb063ca9bc8aa4ce61c6f0402c04dc0433b..636f71ab9eb71ae1b74d32286a5d475626143deb 100644 (file)
--- a/arch/mips64/kernel/signal32.c
+++ b/arch/mips64/kernel/signal32.c
@@ -425,7 +425,7 @@ badframe:
        force_sig(SIGSEGV, current);
 }
 
-static int inline
+static inline int
 setup_sigcontext(struct pt_regs *regs, struct sigcontext *sc)
 {
        int err = 0;

diff --git a/arch/ppc/8260_io/uart.c b/arch/ppc/8260_io/uart.c
index a52f39e338e3fd4bc134bc3398708d4bfe56b1c8..4633b43f381bd3a1749b19773d8aad41ab8d6086 100644 (file)
--- a/arch/ppc/8260_io/uart.c
+++ b/arch/ppc/8260_io/uart.c
@@ -2035,7 +2035,7 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp)
  * /proc fs routines....
  */
 
-static int inline line_info(char *buf, struct serial_state *state)
+static inline int line_info(char *buf, struct serial_state *state)
 {
 #ifdef notdef
        struct async_struct *info = state->info, scr_info;

diff --git a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c
index 3be25081d6349b019689587e125492c48eafd93f..690c4e501aa9b35ca670c57e2a701652176009c1 100644 (file)
--- a/arch/ppc/8xx_io/uart.c
+++ b/arch/ppc/8xx_io/uart.c
@@ -2091,7 +2091,7 @@ static int rs_8xx_open(struct tty_struct *tty, struct file * filp)
  * /proc fs routines....
  */
 
-static int inline line_info(char *buf, struct serial_state *state)
+static inline int line_info(char *buf, struct serial_state *state)
 {
 #ifdef notdef
        struct async_struct *info = state->info, scr_info;

diff --git a/arch/ppc/boot/prep/vreset.c b/arch/ppc/boot/prep/vreset.c
index f72d00b767414ecc3a365c10203d72f55a539d0b..16c786de9aa5ad2706b488a82d9571efdf2023e8 100644 (file)
--- a/arch/ppc/boot/prep/vreset.c
+++ b/arch/ppc/boot/prep/vreset.c
@@ -389,7 +389,7 @@ extern void puthex(unsigned long);
 extern void puts(const char *);
 static void unlockS3(void);
 
-static void inline
+static inline void
 outw(int port, unsigned short val)
 {
        outb(port, val >> 8);

diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 45fabd1e471e15fee391ae496640a1a0671eb178..85b280253c26d9db57ef82290c2cf1e6cae9fc10 100644 (file)
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -185,7 +185,7 @@ int handle_IRQ_event(unsigned int irq, struct pt_regs * regs,
  *     This function may be called from IRQ context.
  */
  
-void inline disable_irq_nosync(unsigned int irq)
+inline void disable_irq_nosync(unsigned int irq)
 {
        irq_desc_t *desc = irq_desc + irq;
        unsigned long flags;

diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 6266c936c135104ac7d1f57b802671d87cda4af5..816c40f9308fb8c2e08e06f013ab00f8f42222c3 100644 (file)
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -142,7 +142,7 @@ static spinlock_t tlbstate_lock = SPIN_LOCK_UNLOCKED;
  * We cannot call mmdrop() because we are in interrupt context, 
  * instead update mm->cpu_vm_mask.
  */
-static void inline leave_mm (unsigned long cpu)
+static inline void leave_mm (unsigned long cpu)
 {
        if (read_pda(mmu_state) == TLBSTATE_OK)
                BUG();

diff --git a/crypto/blowfish.c b/crypto/blowfish.c
index 54e98a86b248d71152ac39147b2679cece3abce0..f7f5eb756a123fb5bcc125d7373138e671d38e19 100644 (file)
--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@@ -31,7 +31,7 @@ struct bf_ctx {
        u32 s[1024];
 };
 
-const static u32 bf_pbox[16 + 2] = {
+static const u32 bf_pbox[16 + 2] = {
        0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
        0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
        0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
@@ -39,7 +39,7 @@ const static u32 bf_pbox[16 + 2] = {
        0x9216d5d9, 0x8979fb1b,
 };
 
-const static u32 bf_sbox[256 * 4] = {
+static const u32 bf_sbox[256 * 4] = {
        0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
        0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
        0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,

diff --git a/crypto/des.c b/crypto/des.c
index ed85916730b0e44f0a3c42fbb4a8dd5a1bfba7fa..08ca675c24f7116b85fc719922154f15a71b8eef 100644 (file)
--- a/crypto/des.c
+++ b/crypto/des.c
@@ -46,7 +46,7 @@ struct des3_ede_ctx {
        u32 expkey[DES3_EDE_EXPKEY_WORDS];
 };
 
-const static u32 des_keymap[] = {
+static const u32 des_keymap[] = {
        0x02080008, 0x02082000, 0x00002008, 0x00000000,
        0x02002000, 0x00080008, 0x02080000, 0x02082008,
        0x00000008, 0x02000000, 0x00082000, 0x00002008,
@@ -184,7 +184,7 @@ const static u32 des_keymap[] = {
        0x20000000, 0x20208000, 0x00000080, 0x20008080,
 };
 
-const static u8 rotors[] = {
+static const u8 rotors[] = {
        34, 13,  5, 46, 47, 18, 32, 41, 11, 53, 33, 20,
        14, 36, 30, 24, 49,  2, 15, 37, 42, 50,  0, 21,
        38, 48,  6, 26, 39,  4, 52, 25, 12, 27, 31, 40,
@@ -266,7 +266,7 @@ const static u8 rotors[] = {
        49, 10, 21, 22, 16, 44, 28,  0, 51, 15,  2, 36,
 };
 
-const static u8 parity[] = {
+static const u8 parity[] = {
        8,1,0,8,0,8,8,0,0,8,8,0,8,0,2,8,0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,3,
        0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,
        0,8,8,0,8,0,0,8,8,0,0,8,0,8,8,0,8,0,0,8,0,8,8,0,0,8,8,0,8,0,0,8,

diff --git a/crypto/sha1.c b/crypto/sha1.c
index f3a56d838ea4ea3d29eb173a2ca8a91024faebe2..012d872d4477ada997e9d8a1b42e83c0093c2d4a 100644 (file)
--- a/crypto/sha1.c
+++ b/crypto/sha1.c
@@ -107,7 +107,7 @@ static void sha1_transform(u32 *state, const u8 *in)
 static void sha1_init(void *ctx)
 {
        struct sha1_ctx *sctx = ctx;
-       const static struct sha1_ctx initstate = {
+       static const struct sha1_ctx initstate = {
          0,
          { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 },
          { 0, }
@@ -144,7 +144,7 @@ static void sha1_final(void* ctx, u8 *out)
        u32 i, j, index, padlen;
        u64 t;
        u8 bits[8] = { 0, };
-       const static u8 padding[64] = { 0x80, };
+       static const u8 padding[64] = { 0x80, };
 
        t = sctx->count;
        bits[7] = 0xff & t; t>>=8;

diff --git a/drivers/acpi/include/acpiosxf.h b/drivers/acpi/include/acpiosxf.h
index 2326fda0e434da005e64dfc20903a0bcf40b735a..2bf4e3f0e9a41a9a74a9cc00da575c1ad2d670f8 100644 (file)
--- a/drivers/acpi/include/acpiosxf.h
+++ b/drivers/acpi/include/acpiosxf.h
@@ -235,14 +235,14 @@ acpi_os_write_memory (
 acpi_status
 acpi_os_read_pci_configuration (
        acpi_pci_id             *pci_id,
-       u32                     register,
+       u32                     reg,
        void                    *value,
        u32                     width);
 
 acpi_status
 acpi_os_write_pci_configuration (
        acpi_pci_id             *pci_id,
-       u32                     register,
+       u32                     reg,
        acpi_integer            value,
        u32                     width);
 

diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index cf9a687b24d24c6c6c4c44b7dc1bda41a809bb31..b423426342059f17f11435ed3c1b246880827d9e 100644 (file)
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1657,8 +1657,8 @@ __setup("sonycd535=", sonycd535_setup);
 
 #endif /* MODULE */
 
-void __exit
-static sony535_exit(void)
+static void __exit
+sony535_exit(void)
 {
        int i;
 

diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
index 9a990ab0c00b714493587241dc8cbff4dc1d59e8..cb16472e3afcfcdc0c558f430047e7f6e1ac48a2 100644 (file)
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
@@ -2503,7 +2503,7 @@ static inline int stl_initeio(stlbrd_t *brdp)
  *     dealing with all types of ECH board.
  */
 
-static int inline stl_initech(stlbrd_t *brdp)
+static inline int stl_initech(stlbrd_t *brdp)
 {
        stlpanel_t      *panelp;
        unsigned int    status, nxtid, ioaddr, conflict;
@@ -5222,7 +5222,7 @@ static void stl_sc26198rxisr(stlport_t *portp, unsigned int iack)
  *     Process an RX bad character.
  */
 
-static void inline stl_sc26198rxbadch(stlport_t *portp, unsigned char status, char ch)
+static inline void stl_sc26198rxbadch(stlport_t *portp, unsigned char status, char ch)
 {
        struct tty_struct       *tty;
        unsigned int            ioaddr;

diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c
index 2d1b2e4da698bce4f376a89c455bd8f491795785..03b72bf668a4d501e59b4bf3faf55565268d1d31 100644 (file)
--- a/drivers/fc4/soc.c
+++ b/drivers/fc4/soc.c
@@ -104,7 +104,7 @@ static void soc_reset(fc_channel *fc)
        soc_enable(s);
 }
 
-static void inline soc_solicited (struct soc *s)
+static inline void soc_solicited (struct soc *s)
 {
        fc_hdr fchdr;
        soc_rsp *hwrsp;
@@ -165,7 +165,7 @@ static void inline soc_solicited (struct soc *s)
        }
 }
 
-static void inline soc_request (struct soc *s, u32 cmd)
+static inline void soc_request (struct soc *s, u32 cmd)
 {
        SOC_SETIMASK(s, s->imask & ~(cmd & SOC_CMD_REQ_QALL));
        SOD(("imask %08lx %08lx\n", s->imask, sbus_readl(s->regs + IMASK)));
@@ -184,7 +184,7 @@ static void inline soc_request (struct soc *s, u32 cmd)
                s->curr_port ^= 1;
 }
 
-static void inline soc_unsolicited (struct soc *s)
+static inline void soc_unsolicited (struct soc *s)
 {
        soc_rsp *hwrsp, *hwrspc;
        soc_cq *sw_cq;

diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index b00c94f6db252ebbddbf56a7a5bc3198b903df32..ef18d4c92edd997c16553e52f45bbd7b0324f479 100644 (file)
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -133,7 +133,7 @@ static void socal_reset(fc_channel *fc)
        socal_enable(s);
 }
 
-static void inline socal_solicited(struct socal *s, unsigned long qno)
+static inline void socal_solicited(struct socal *s, unsigned long qno)
 {
        socal_rsp *hwrsp;
        socal_cq *sw_cq;
@@ -225,7 +225,7 @@ static void inline socal_solicited(struct socal *s, unsigned long qno)
        }
 }
 
-static void inline socal_request (struct socal *s, u32 cmd)
+static inline void socal_request (struct socal *s, u32 cmd)
 {
        SOCAL_SETIMASK(s, s->imask & ~(cmd & SOCAL_CMD_REQ_QALL));
        SOD(("imask %08x %08x\n", s->imask, sbus_readl(s->regs + IMASK)));
@@ -242,7 +242,7 @@ static void inline socal_request (struct socal *s, u32 cmd)
                s->curr_port ^= 1;
 }
 
-static void inline socal_unsolicited (struct socal *s, unsigned long qno)
+static inline void socal_unsolicited (struct socal *s, unsigned long qno)
 {
        socal_rsp *hwrsp, *hwrspc;
        socal_cq *sw_cq;

diff --git a/drivers/hotplug/ibmphp_res.c b/drivers/hotplug/ibmphp_res.c
index 762ad60c71a77efb09e8cc4ea0c75b246ac91e12..27cccc156b7073d16948823eab98da3f6ff00cbf 100644 (file)
--- a/drivers/hotplug/ibmphp_res.c
+++ b/drivers/hotplug/ibmphp_res.c
@@ -1889,7 +1889,7 @@ void ibmphp_print_test (void)
        debug_pci ("***********************END***********************\n");
 }
 
-int static range_exists_already (struct range_node * range, struct bus_node * bus_cur, u8 type)
+static int range_exists_already (struct range_node * range, struct bus_node * bus_cur, u8 type)
 {
        struct range_node * range_cur = NULL;
        switch (type) {

diff --git a/drivers/ide/pci/pdc202xx_old.h b/drivers/ide/pci/pdc202xx_old.h
index a91915c8c7a1f13115a5139f597890532d60c155..b3b5388a5b8088381cb78f9c0b31cf4a0b8763e4 100644 (file)
--- a/drivers/ide/pci/pdc202xx_old.h
+++ b/drivers/ide/pci/pdc202xx_old.h
@@ -14,7 +14,7 @@
 #define PDC202XX_DEBUG_DRIVE_INFO              0
 #define PDC202XX_DECODE_REGISTER_INFO          0
 
-const static char *pdc_quirk_drives[] = {
+static const char *pdc_quirk_drives[] = {
        "QUANTUM FIREBALLlct08 08",
        "QUANTUM FIREBALLP KA6.4",
        "QUANTUM FIREBALLP KA9.1",

diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index 0e07e706a5763460832a6575c7f8d75a50f74f13..a679f52a091202e1900f177e6b74567916b6cb14 100644 (file)
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -267,7 +267,7 @@ static void notify_down(u32 contr)
 
 /* ------------------------------------------------------------ */
 
-static void inline notify_doit(struct capi_notifier *np)
+static inline void notify_doit(struct capi_notifier *np)
 {
        switch (np->cmd) {
                case KCI_CONTRUP:

diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 0c7838de32891478e290d2b26b3323fbcb7e33a2..55e9a01d4e290f5b0a1113dab0d57154cef81fa5 100644 (file)
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -250,7 +250,7 @@ static void raid_end_bio_io(r1bio_t *r1_bio, int uptodate)
 /*
  * Update disk head position estimator based on IRQ completion info.
  */
-static void inline update_head_pos(int disk, r1bio_t *r1_bio)
+static inline void update_head_pos(int disk, r1bio_t *r1_bio)
 {
        conf_t *conf = mddev_to_conf(r1_bio->mddev);
 

diff --git a/drivers/media/dvb/av7110/av7110.c b/drivers/media/dvb/av7110/av7110.c
index 0a8971b2f0173e30d33b886541b07afba5a49970..4df0e077f88aed908f39750b2068d0ad38375b0d 100644 (file)
--- a/drivers/media/dvb/av7110/av7110.c
+++ b/drivers/media/dvb/av7110/av7110.c
@@ -2245,7 +2245,7 @@ VidMode(av7110_t *av7110, int mode)
 }
            
 
-static int inline
+static inline int
 vidcom(av7110_t *av7110, u32 com, u32 arg)
 {
         return outcom(av7110, 0x80, 0x02, 4, 
@@ -2253,7 +2253,7 @@ vidcom(av7110_t *av7110, u32 com, u32 arg)
                       (arg>>16), (arg&0xffff));
 }
 
-static int inline
+static inline int
 audcom(av7110_t *av7110, u32 com)
 {
         return outcom(av7110, 0x80, 0x03, 4, 

diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index af042ec7b2ade033fe0e0e39d4027f6bcac85f42..4ddef3f99205bc063c68270153b393c8b3725081 100644 (file)
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -1634,7 +1634,7 @@ static int free_frame_buf(struct cam_data *cam)
 }
 
 
-static void inline free_frames(struct cpia_frame frame[FRAME_NUM])
+static inline void free_frames(struct cpia_frame frame[FRAME_NUM])
 {
        int i;
 

diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index fb87cdd8b87301a1d66c6d051a590f61061067b0..6259fe17c681aafe18c1ac789347c7c5fd847144 100644 (file)
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -107,7 +107,7 @@ MODULE_PARM_DESC(mem_type, "Set Memory type (0=Flash, 1=RAM, 2=ROM, default=0)")
 
 
 
-static void inline cs_error(client_handle_t handle, int func, int ret)
+static inline void cs_error(client_handle_t handle, int func, int ret)
 {
        error_info_t err = { func, ret };
        CardServices(ReportError, handle, &err);

diff --git a/drivers/net/e100/e100_main.c b/drivers/net/e100/e100_main.c
index d118a1585ca0e9a5eeae4654be1995e503694b55..3f38f62ada89b97486e2f800a7baf115b7b5bf8e 100644 (file)
--- a/drivers/net/e100/e100_main.c
+++ b/drivers/net/e100/e100_main.c
@@ -1812,7 +1812,7 @@ e100intr(int irq, void *dev_inst, struct pt_regs *regs)
  *
  * This routine frees resources of TX skbs.
  */
-static void inline
+static inline void
 e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb)
 {
        if (tcb->tcb_skb) {

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index 2d8c089d5c93ab8ba867214c8605c94c23c7113a..93237b2af18a4c7232a1414da8f3745af39db9a9 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -342,7 +342,7 @@ static inline int calc_crc_ccitt(const unsigned char *buf, int cnt)
 
 /* --------------------------------------------------------------------- */
 
-static void inline baycom_int_freq(struct baycom_state *bc)
+static inline void baycom_int_freq(struct baycom_state *bc)
 {
 #ifdef BAYCOM_DEBUG
        unsigned long cur_jiffies = jiffies;
@@ -431,7 +431,7 @@ static void epp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
 /* ---------------------------------------------------------------------- */
 
-static void inline do_kiss_params(struct baycom_state *bc,
+static inline void do_kiss_params(struct baycom_state *bc,
                                  unsigned char *data, unsigned long len)
 {
 

diff --git a/drivers/net/hamradio/baycom_ser_fdx.c b/drivers/net/hamradio/baycom_ser_fdx.c
index 64eea939a50e897fc4236eda6dcb85b03ba216f5..d46e75c34c95cddcda7c0f51ead1ed200cdd78de 100644 (file)
--- a/drivers/net/hamradio/baycom_ser_fdx.c
+++ b/drivers/net/hamradio/baycom_ser_fdx.c
@@ -152,7 +152,7 @@ struct baycom_state {
 
 /* --------------------------------------------------------------------- */
 
-static void inline baycom_int_freq(struct baycom_state *bc)
+static inline void baycom_int_freq(struct baycom_state *bc)
 {
 #ifdef BAYCOM_DEBUG
        unsigned long cur_jiffies = jiffies;

diff --git a/drivers/net/hamradio/baycom_ser_hdx.c b/drivers/net/hamradio/baycom_ser_hdx.c
index 14e18b0b1df0ba2e7cba208b804a187c4b073818..92644c2089ab0e8e45baeb5c475aaf795d3f125b 100644 (file)
--- a/drivers/net/hamradio/baycom_ser_hdx.c
+++ b/drivers/net/hamradio/baycom_ser_hdx.c
@@ -143,7 +143,7 @@ struct baycom_state {
 
 /* --------------------------------------------------------------------- */
 
-static void inline baycom_int_freq(struct baycom_state *bc)
+static inline void baycom_int_freq(struct baycom_state *bc)
 {
 #ifdef BAYCOM_DEBUG
        unsigned long cur_jiffies = jiffies;
@@ -166,7 +166,7 @@ static void inline baycom_int_freq(struct baycom_state *bc)
  * ===================== SER12 specific routines =========================
  */
 
-static void inline ser12_set_divisor(struct net_device *dev,
+static inline void ser12_set_divisor(struct net_device *dev,
                                     unsigned char divisor)
 {
        outb(0x81, LCR(dev->base_addr));        /* DLAB = 1 */

diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 7587ce3f2ecbc1335cbca8752550abbaaee1d8f7..da2719f5fef880e21b089f8d2b595a20c55726bb 100644 (file)
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -1479,7 +1479,7 @@ static inline int ioc3_is_menet(struct pci_dev *pdev)
               && dev->device == PCI_DEVICE_ID_SGI_IOC3;
 }
 
-static void inline ioc3_serial_probe(struct pci_dev *pdev,
+static inline void ioc3_serial_probe(struct pci_dev *pdev,
                                struct ioc3 *ioc3)
 {
        struct serial_struct req;

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index d677e18324976156f4622fa472e5a66daef4c2c4..1d2793c8f350ebcbf9ab18aa68e594dc3e8aeb59 100644 (file)
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -1061,7 +1061,7 @@ err_out:
        return ret;
 }
 
-static void inline
+static inline void
 i596_handle_CU_completion(struct net_device *dev,
                          volatile struct i596_private *lp,
                          unsigned short status,

diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 95f72759aa0fc084aa5d0951944c87fec9f95c1e..f2be232c4de1b7d397ba2fe33c3e0a3a29a11d91 100644 (file)
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -141,14 +141,14 @@ static int set_mac_address(struct net_device *dev, void *addr);
 #define tx_done(dev) 1
 
 /* For reading/writing registers ISA-style */
-static int inline
+static inline int
 readreg_io(struct net_device *dev, int portno)
 {
        nubus_writew(swab16(portno), dev->base_addr + ADD_PORT);
        return swab16(nubus_readw(dev->base_addr + DATA_PORT));
 }
 
-static void inline
+static inline void
 writereg_io(struct net_device *dev, int portno, int value)
 {
        nubus_writew(swab16(portno), dev->base_addr + ADD_PORT);
@@ -156,13 +156,13 @@ writereg_io(struct net_device *dev, int portno, int value)
 }
 
 /* These are for reading/writing registers in shared memory */
-static int inline
+static inline int
 readreg(struct net_device *dev, int portno)
 {
        return swab16(nubus_readw(dev->mem_start + portno));
 }
 
-static void inline
+static inline void
 writereg(struct net_device *dev, int portno, int value)
 {
        nubus_writew(swab16(value), dev->mem_start + portno);

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 3551dc49874f721956f5f49dbc9146855f8fb246..ae3c088214fddfa9ad399355c15a4d9cdd31f1b2 100644 (file)
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -1282,7 +1282,7 @@ MODULE_PARM_DESC(parport, "List of parport device numbers to use by plip");
 
 static struct net_device *dev_plip[PLIP_MAX] = { NULL, };
 
-static int inline 
+static inline int
 plip_searchfor(int list[], int a)
 {
        int i;

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index f3b5ef9ae5023223912c306628022f94024c3065..dbcbebe706fe8423183ea89894acce7b395b9075 100644 (file)
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -1933,7 +1933,7 @@ reject:           /* Reject the packet */
        spin_unlock_irqrestore(&cosa->lock, flags);
 }
 
-static void inline eot_interrupt(struct cosa_data *cosa, int status)
+static inline void eot_interrupt(struct cosa_data *cosa, int status)
 {
        unsigned long flags, flags1;
        spin_lock_irqsave(&cosa->lock, flags);

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 71c48db5f3ecc53c5ee14d780b297c25ddc7474e..f803b5919c4f547f3c455449d03680d0c4abfb72 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -114,7 +114,7 @@ static void frob_econtrol (struct parport *pb, unsigned char m,
        outb ((ectr & ~m) ^ v, ECONTROL (pb));
 }
 
-static void __inline__ frob_set_mode (struct parport *p, int mode)
+static __inline__ void frob_set_mode (struct parport *p, int mode)
 {
        frob_econtrol (p, ECR_MODE_MASK, mode << 5);
 }

diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
index d11383778c1843fafc7972b27f674b99ee668dc1..fadd276ccd95ce8de4aa50d43cd540c5149b22b5 100644 (file)
--- a/drivers/pnp/pnpbios/core.c
+++ b/drivers/pnp/pnpbios/core.c
@@ -1035,7 +1035,7 @@ static unsigned char *node_possible_resource_data_to_dev(unsigned char *p, struc
 #define CHAR(id,a) (0x40 + (((id)>>a) & 31))
 //
 
-static void inline pnpid32_to_pnpid(u32 id, char *str)
+static inline void pnpid32_to_pnpid(u32 id, char *str)
 {
        const char *hex = "0123456789abcdef";
 
@@ -1383,7 +1383,7 @@ static struct pnp_protocol pnpbios_protocol = {
        .disable = pnpbios_disable_resources,
 };
 
-static int inline insert_device(struct pnp_dev *dev)
+static inline int insert_device(struct pnp_dev *dev)
 {
        struct list_head * pos;
        struct pnp_dev * pnp_dev;

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 283998c0c6d57228720d6541ff3c41ee31ccccfe..eb24cfde6960aeec1eee004b787009131f36325a 100644 (file)
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -1738,7 +1738,7 @@ static int mega_driver_ioctl (mega_host_config * megaCfg, Scsi_Cmnd * SCpnt)
        return 1;
 }
 
-static void inline set_mbox_xfer_addr (mega_host_config * megaCfg, mega_scb * pScb,
+static inline void set_mbox_xfer_addr (mega_host_config * megaCfg, mega_scb * pScb,
                    mega_ioctl_mbox * mbox, u32 direction)
 {
 

diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c
index dc4399609d443c05da5b265ab1639d729a959d4e..0eaded61130bed9a843396e2ff566d55e7253a8a 100644 (file)
--- a/drivers/serial/68360serial.c
+++ b/drivers/serial/68360serial.c
@@ -2134,7 +2134,7 @@ static int rs_360_open(struct tty_struct *tty, struct file * filp)
  * /proc fs routines....
  */
 
-static int inline line_info(char *buf, struct serial_state *state)
+static inline int line_info(char *buf, struct serial_state *state)
 {
 #ifdef notdef
        struct async_struct *info = state->info, scr_info;

diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c
index 1029a1d126ce20ebf2c8884b7c8c72dd72393b1b..63f8871a2ae984ade9a997f9ac39edd52a5776bb 100644 (file)
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
@@ -313,7 +313,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
 
 MODULE_DEVICE_TABLE(pnp, pnp_dev_table);
 
-static void inline avoid_irq_share(struct pnp_dev *dev)
+static inline void avoid_irq_share(struct pnp_dev *dev)
 {
        unsigned int map = 0x1FF8;
        struct pnp_irq *irq;

diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c
index 4a0e09a4851c0ea91e744ac15d8ada73521fb0b1..af2b94ac94ac303fd59a675bb201a71f84b61711 100644 (file)
--- a/drivers/usb/host/uhci-debug.c
+++ b/drivers/usb/host/uhci-debug.c
@@ -18,7 +18,7 @@
 #include "uhci-hcd.h"
 
 /* Handle REALLY large printk's so we don't overflow buffers */
-static void inline lprintk(char *buf)
+static inline void lprintk(char *buf)
 {
        char *p;
 
@@ -34,7 +34,7 @@ static void inline lprintk(char *buf)
        }
 }
 
-static int inline uhci_is_skeleton_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
+static inline int uhci_is_skeleton_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
 {
        int i;
 

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index 3b5768ee18129f02e35870d7508672757e9b7051..b3a8d06d6c19fd5b164a271011cde73de97929be 100644 (file)
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -165,7 +165,7 @@ static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci, struct usb_device *d
        return td;
 }
 
-static void inline uhci_fill_td(struct uhci_td *td, __u32 status,
+static inline void uhci_fill_td(struct uhci_td *td, __u32 status,
                __u32 token, __u32 buffer)
 {
        td->status = cpu_to_le32(status);

diff --git a/drivers/video/sticore.h b/drivers/video/sticore.h
index 0572f4fb1d5e0670bfe6359dd1158638295fa0a1..7e7e1546f6e74fefb0ec78d0e9cbc852f22214b1 100644 (file)
--- a/drivers/video/sticore.h
+++ b/drivers/video/sticore.h
@@ -42,7 +42,7 @@
 
 #define STI_PTR(p)     (p)
 #define PTR_STI(p)     (p)
-static int inline STI_CALL( unsigned long func, 
+static inline int STI_CALL( unsigned long func, 
                void *flags, void *inptr, void *outptr, void *glob_cfg )
 {
        int (*f)(void *,void *,void *,void *);

diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index 0a7164836b115f593d37477b9c4fce8d35e7ac6e..42a81113a39618fbc326f6b7c29674f8d10c53f4 100644 (file)
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -86,7 +86,7 @@ typedef struct {
 } befs_btree_node;
 
 /* local constants */
-const static befs_off_t befs_bt_inval = 0xffffffffffffffff;
+static const befs_off_t befs_bt_inval = 0xffffffffffffffff;
 
 /* local functions */
 static int befs_btree_seekleaf(struct super_block *sb, befs_data_stream * ds,

diff --git a/fs/cifs/netmisc.c b/fs/cifs/netmisc.c
index cf279a4b6d305a975732f2d484ca8af2408d2d89..d3f6e465cc5e437bd9cd515f38ed03a048975710 100644 (file)
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
@@ -187,7 +187,7 @@ inet_addr(char *cp)
 convert a NT status code to a dos class/code
  *****************************************************************************/
 /* NT status -> dos error map */
-const static struct {
+static const struct {
        __u8 dos_class;
        __u16 dos_code;
        __u32 ntstatus;

diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 4a3e6315f9a9e54614675dfc010316897dd14bc3..630dbff4001caa80de7449a77e7282f2107458cd 100644 (file)
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -704,7 +704,7 @@ static inline int ext3_match (int len, const char * const name,
 /*
  * Returns 0 if not found, -1 on failure, and 1 on success
  */
-static int inline search_dirblock(struct buffer_head * bh,
+static inline int search_dirblock(struct buffer_head * bh,
                                  struct inode *dir,
                                  struct dentry *dentry,
                                  unsigned long offset,

diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c
index dd3ccbc9033f17846dd04e7f84db8696a1ef10db..72327856f893dbbc3420b1849b5f58c746814251 100644 (file)
--- a/fs/qnx4/bitmap.c
+++ b/fs/qnx4/bitmap.c
@@ -29,7 +29,7 @@ int qnx4_new_block(struct super_block *sb)
        return 0;
 }
 
-void count_bits(const register char *bmPart, register int size,
+void count_bits(register const char *bmPart, register int size,
                int *const tf)
 {
        char b;

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index d16eae31dbe21a8ca760d1ce4a12eabcad1b254d..65d2824a0cbfec49a17f2f3ed8c4024951569863 100644 (file)
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -474,7 +474,7 @@ int reiserfs_parse_alloc_options(struct super_block * s, char * options)
     return 0;
 }
   
-static void inline new_hashed_relocation (reiserfs_blocknr_hint_t * hint)
+static inline void new_hashed_relocation (reiserfs_blocknr_hint_t * hint)
 {
     char * hash_in;
     if (hint->formatted_node) {
@@ -493,7 +493,7 @@ static void inline new_hashed_relocation (reiserfs_blocknr_hint_t * hint)
     hint->search_start = hint->beg + keyed_hash(hash_in, 4) % (hint->end - hint->beg);
 }
 
-static void inline get_left_neighbor(reiserfs_blocknr_hint_t *hint)
+static inline void get_left_neighbor(reiserfs_blocknr_hint_t *hint)
 {
     struct path * path;
     struct buffer_head * bh;
@@ -539,7 +539,7 @@ static void inline get_left_neighbor(reiserfs_blocknr_hint_t *hint)
    specified as number of percent with mount option device, else try to put
    on last of device.  This is not to say it is good code to do so,
    but the effect should be measured.  */
-static void inline set_border_in_hint(struct super_block *s, reiserfs_blocknr_hint_t *hint)
+static inline void set_border_in_hint(struct super_block *s, reiserfs_blocknr_hint_t *hint)
 {
     b_blocknr_t border = SB_BLOCK_COUNT(s) / REISERFS_SB(s)->s_alloc_options.border;
 
@@ -549,7 +549,7 @@ static void inline set_border_in_hint(struct super_block *s, reiserfs_blocknr_hi
        hint->beg = border;
 }
 
-static void inline displace_large_file(reiserfs_blocknr_hint_t *hint)
+static inline void displace_large_file(reiserfs_blocknr_hint_t *hint)
 {
     if ( TEST_OPTION(displace_based_on_dirid, hint->th->t_super))
        hint->search_start = hint->beg + keyed_hash((char *)(&INODE_PKEY(hint->inode)->k_dir_id), 4) % (hint->end - hint->beg);
@@ -557,7 +557,7 @@ static void inline displace_large_file(reiserfs_blocknr_hint_t *hint)
        hint->search_start = hint->beg + keyed_hash((char *)(&INODE_PKEY(hint->inode)->k_objectid), 4) % (hint->end - hint->beg);
 }
 
-static void inline hash_formatted_node(reiserfs_blocknr_hint_t *hint)
+static inline void hash_formatted_node(reiserfs_blocknr_hint_t *hint)
 {
    char * hash_in;
 
@@ -571,13 +571,13 @@ static void inline hash_formatted_node(reiserfs_blocknr_hint_t *hint)
        hint->search_start = hint->beg + keyed_hash(hash_in, 4) % (hint->end - hint->beg);
 }
 
-static int inline this_blocknr_allocation_would_make_it_a_large_file(reiserfs_blocknr_hint_t *hint)
+static inline int this_blocknr_allocation_would_make_it_a_large_file(reiserfs_blocknr_hint_t *hint)
 {
     return hint->block == REISERFS_SB(hint->th->t_super)->s_alloc_options.large_file_size;
 }
 
 #ifdef DISPLACE_NEW_PACKING_LOCALITIES
-static void inline displace_new_packing_locality (reiserfs_blocknr_hint_t *hint)
+static inline void displace_new_packing_locality (reiserfs_blocknr_hint_t *hint)
 {
     struct key * key = &hint->key;
 
@@ -586,7 +586,7 @@ static void inline displace_new_packing_locality (reiserfs_blocknr_hint_t *hint)
 }
   #endif
 
-static int inline old_hashed_relocation (reiserfs_blocknr_hint_t * hint)
+static inline int old_hashed_relocation (reiserfs_blocknr_hint_t * hint)
 {
     unsigned long border;
     unsigned long hash_in;
@@ -603,7 +603,7 @@ static int inline old_hashed_relocation (reiserfs_blocknr_hint_t * hint)
     return 1;
   }
   
-static int inline old_way (reiserfs_blocknr_hint_t * hint)
+static inline int old_way (reiserfs_blocknr_hint_t * hint)
 {
     unsigned long border;
     
@@ -618,7 +618,7 @@ static int inline old_way (reiserfs_blocknr_hint_t * hint)
     return 1;
 }
 
-static void inline hundredth_slices (reiserfs_blocknr_hint_t * hint)
+static inline void hundredth_slices (reiserfs_blocknr_hint_t * hint)
 {
     struct key * key = &hint->key;
     unsigned long slice_start;
@@ -629,7 +629,7 @@ static void inline hundredth_slices (reiserfs_blocknr_hint_t * hint)
     }
 }
   
-static void inline determine_search_start(reiserfs_blocknr_hint_t *hint,
+static inline void determine_search_start(reiserfs_blocknr_hint_t *hint,
                                          int amount_needed)
 {
     struct super_block *s = hint->th->t_super;

diff --git a/fs/xfs/linux/xfs_iops.c b/fs/xfs/linux/xfs_iops.c
index 23af0da7eab3030842150a2fc7036053383f75b2..24b36a4308d84c497230c89c8be894102526af34 100644 (file)
--- a/fs/xfs/linux/xfs_iops.c
+++ b/fs/xfs/linux/xfs_iops.c
@@ -58,7 +58,7 @@ validate_fields(
  *
  * XXX(hch):  nfsd is broken, better fix it instead.
  */
-STATIC int inline
+STATIC inline int
 has_fs_struct(struct task_struct *task)
 {
        return (task->fs != init_task.fs);

diff --git a/fs/xfs/xfs_bit.c b/fs/xfs/xfs_bit.c
index e5deb3dc40e6171995ec3ace8aad43c3d2fbb5ab..7589989762003e2def92ab1ec9f273b67f72c33b 100644 (file)
--- a/fs/xfs/xfs_bit.c
+++ b/fs/xfs/xfs_bit.c
@@ -117,7 +117,7 @@ static const char xfs_countbit[256] = {
 /*
  * xfs_highbit32: get high bit set out of 32-bit argument, -1 if none set.
  */
-int inline
+inline int
 xfs_highbit32(
        __uint32_t      v)
 {

diff --git a/include/linux/ncp_fs.h b/include/linux/ncp_fs.h
index a15a7ac2f6a33aa35e765d27c5eefa12b3d7666b..9e2f1923ce5c1446a2412f5672f21c069cd04905 100644 (file)
--- a/include/linux/ncp_fs.h
+++ b/include/linux/ncp_fs.h
@@ -248,7 +248,7 @@ int ncp_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
 /* linux/fs/ncpfs/sock.c */
 int ncp_request2(struct ncp_server *server, int function,
        void* reply, int max_reply_size);
-static int inline ncp_request(struct ncp_server *server, int function) {
+static inline int ncp_request(struct ncp_server *server, int function) {
        return ncp_request2(server, function, server->packet, server->packet_size);
 }
 int ncp_connect(struct ncp_server *server);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 553864c6a5fb838a2ebd8d69a1065b70a18c3156..7b693e39425f1979538442a825ae808464d5195c 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -592,23 +592,23 @@ static inline int pci_read_config_byte(struct pci_dev *dev, int where, u8 *val)
 {
        return pci_bus_read_config_byte (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_read_config_word(struct pci_dev *dev, int where, u16 *val)
+static inline int pci_read_config_word(struct pci_dev *dev, int where, u16 *val)
 {
        return pci_bus_read_config_word (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_read_config_dword(struct pci_dev *dev, int where, u32 *val)
+static inline int pci_read_config_dword(struct pci_dev *dev, int where, u32 *val)
 {
        return pci_bus_read_config_dword (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_write_config_byte(struct pci_dev *dev, int where, u8 val)
+static inline int pci_write_config_byte(struct pci_dev *dev, int where, u8 val)
 {
        return pci_bus_write_config_byte (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_write_config_word(struct pci_dev *dev, int where, u16 val)
+static inline int pci_write_config_word(struct pci_dev *dev, int where, u16 val)
 {
        return pci_bus_write_config_word (dev->bus, dev->devfn, where, val);
 }
-static int inline pci_write_config_dword(struct pci_dev *dev, int where, u32 val)
+static inline int pci_write_config_dword(struct pci_dev *dev, int where, u32 val)
 {
        return pci_bus_write_config_dword (dev->bus, dev->devfn, where, val);
 }

diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index 3d37e47dd968d325a150928afee530a7b418b256..74e53a04907e05e4a117034a342297694b76d690 100644 (file)
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -244,7 +244,7 @@ static inline struct cache_head  *cache_get(struct cache_head *h)
 }
 
 
-static int inline cache_put(struct cache_head *h, struct cache_detail *cd)
+static inline int cache_put(struct cache_head *h, struct cache_detail *cd)
 {
        atomic_dec(&h->refcnt);
        if (!atomic_read(&h->refcnt) &&

diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
index cb36271f137603259ede3b73c4720e27feca57e0..9408ba6dbe34464b472ce8d761913c4a232164d9 100644 (file)
--- a/include/linux/sunrpc/svc.h
+++ b/include/linux/sunrpc/svc.h
@@ -171,7 +171,7 @@ xdr_ressize_check(struct svc_rqst *rqstp, u32 *p)
        return vec->iov_len <= PAGE_SIZE;
 }
 
-static int inline svc_take_page(struct svc_rqst *rqstp)
+static inline int svc_take_page(struct svc_rqst *rqstp)
 {
        if (rqstp->rq_arghi <= rqstp->rq_argused)
                return -ENOMEM;
@@ -180,7 +180,7 @@ static int inline svc_take_page(struct svc_rqst *rqstp)
        return 0;
 }
 
-static void inline svc_pushback_allpages(struct svc_rqst *rqstp)
+static inline void svc_pushback_allpages(struct svc_rqst *rqstp)
 {
         while (rqstp->rq_resused) {
                if (rqstp->rq_respages[--rqstp->rq_resused] == NULL)
@@ -191,7 +191,7 @@ static void inline svc_pushback_allpages(struct svc_rqst *rqstp)
        }
 }
 
-static void inline svc_pushback_unused_pages(struct svc_rqst *rqstp)
+static inline void svc_pushback_unused_pages(struct svc_rqst *rqstp)
 {
         while (rqstp->rq_resused) {
                if (rqstp->rq_respages[--rqstp->rq_resused] != NULL) {
@@ -204,7 +204,7 @@ static void inline svc_pushback_unused_pages(struct svc_rqst *rqstp)
        }
 }
 
-static void inline svc_free_allpages(struct svc_rqst *rqstp)
+static inline void svc_free_allpages(struct svc_rqst *rqstp)
 {
         while (rqstp->rq_resused) {
                if (rqstp->rq_respages[--rqstp->rq_resused] == NULL)

diff --git a/ipc/msg.c b/ipc/msg.c
index f4c494e3c93b24eb789995a4cd99d434e502d58c..8a7d035dfefcba638f8c0238c66b0fc3e6fd4c29 100644 (file)
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -584,7 +584,7 @@ static int testmsg(struct msg_msg* msg,long type,int mode)
        return 0;
 }
 
-static int inline pipelined_send(struct msg_queue* msq, struct msg_msg* msg)
+static inline int pipelined_send(struct msg_queue* msq, struct msg_msg* msg)
 {
        struct list_head* tmp;
 
@@ -693,7 +693,7 @@ out_free:
        return err;
 }
 
-static int inline convert_mode(long* msgtyp, int msgflg)
+static inline int convert_mode(long* msgtyp, int msgflg)
 {
        /* 
         *  find message of correct type.

diff --git a/net/ipv4/netfilter/ip_nat_snmp_basic.c b/net/ipv4/netfilter/ip_nat_snmp_basic.c
index 1ded416880e823fe492cefaa9483db387091f74d..1499b946b5f54b6833ce49a3f5c6f94d78005c68 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/ip_nat_snmp_basic.c
@@ -606,7 +606,7 @@ struct snmp_v1_trap
 #define SERR_NSI    1
 #define SERR_EOM    2
 
-static void inline mangle_address(unsigned char *begin,
+static inline void mangle_address(unsigned char *begin,
                                   unsigned char *addr,
                                   const struct oct1_map *map,
                                   u_int16_t *check);
@@ -995,7 +995,7 @@ static void fast_csum(unsigned char *csum,
  *     - begin points to the start of the snmp messgae
  *      - addr points to the start of the address
  */
-static void inline mangle_address(unsigned char *begin,
+static inline void mangle_address(unsigned char *begin,
                                   unsigned char *addr,
                                   const struct oct1_map *map,
                                   u_int16_t *check)

diff --git a/net/ipv4/netfilter/ipt_ECN.c b/net/ipv4/netfilter/ipt_ECN.c
index 148f21db53b56195d2d77952aeea9ec4d0ad0d57..d14e7cce6cac6924114363488141d7c3a845a25f 100644 (file)
--- a/net/ipv4/netfilter/ipt_ECN.c
+++ b/net/ipv4/netfilter/ipt_ECN.c
@@ -22,7 +22,7 @@ MODULE_LICENSE("GPL");
  *     return 0 in case there was no ECT codepoint
  *     return 1 in case ECT codepoint has been overwritten
  *     return < 0 in case there was error */
-static int inline
+static inline int
 set_ect_ip(struct sk_buff **pskb, struct iphdr *iph,
           const struct ipt_ECN_info *einfo)
 {
@@ -55,7 +55,7 @@ set_ect_ip(struct sk_buff **pskb, struct iphdr *iph,
        return 0;
 }
 
-static int inline
+static inline int
 set_ect_tcp(struct sk_buff **pskb, struct iphdr *iph,
            const struct ipt_ECN_info *einfo)
 {

diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c
index c3ac13446810b6975c821ebe5e2884fb330bbfcb..ecbe731fcb6affa8501212379fef52872bb1694f 100644 (file)
--- a/sound/oss/esssolo1.c
+++ b/sound/oss/esssolo1.c
@@ -266,7 +266,7 @@ static inline int read_seq(struct solo1_state *s, unsigned char *data)
         return 0;
 }
 
-static int inline reset_ctrl(struct solo1_state *s)
+static inline int reset_ctrl(struct solo1_state *s)
 {
         int i;
 

diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index b0c360a24992c4cb8f820cb89ec60b411d66733b..569ba8fd386c722f187d547079f244729e8383b1 100644 (file)
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -882,7 +882,7 @@ static int drain_dac(struct vrc5477_ac97_state *s, int nonblock)
 
 /* --------------------------------------------------------------------- */
 
-static int inline 
+static inline int
 copy_two_channel_adc_to_user(struct vrc5477_ac97_state *s, 
                             char *buffer, 
                             int copyCount)
@@ -912,7 +912,7 @@ copy_two_channel_adc_to_user(struct vrc5477_ac97_state *s,
 }
 
 /* return the total bytes that is copied */
-static int inline 
+static inline int
 copy_adc_to_user(struct vrc5477_ac97_state *s,
                 char * buffer,
                 size_t count,
@@ -1039,7 +1039,7 @@ vrc5477_ac97_read(struct file *file,
        return ret;
 }
 
-static int inline 
+static inline int
 copy_two_channel_dac_from_user(struct vrc5477_ac97_state *s, 
                               const char *buffer, 
                               int copyCount)
@@ -1073,7 +1073,7 @@ copy_two_channel_dac_from_user(struct vrc5477_ac97_state *s,
 }
 
 /* return the total bytes that is copied */
-static int inline 
+static inline int
 copy_dac_from_user(struct vrc5477_ac97_state *s, 
                   const char *buffer, 
                   size_t count,