diff options
Diffstat (limited to 'drivers')
29 files changed, 44 insertions, 44 deletions
diff --git a/drivers/acpi/include/acpiosxf.h b/drivers/acpi/include/acpiosxf.h index 2326fda0e434..2bf4e3f0e9a4 100644 --- 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 cf9a687b24d2..b42342634205 100644 --- 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 9a990ab0c00b..cb16472e3afc 100644 --- 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 2d1b2e4da698..03b72bf668a4 100644 --- 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 b00c94f6db25..ef18d4c92edd 100644 --- 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 762ad60c71a7..27cccc156b70 100644 --- 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 a91915c8c7a1..b3b5388a5b80 100644 --- 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 0e07e706a576..a679f52a0912 100644 --- 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 0c7838de3289..55e9a01d4e29 100644 --- 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 0a8971b2f017..4df0e077f88a 100644 --- 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 af042ec7b2ad..4ddef3f99205 100644 --- 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 fb87cdd8b873..6259fe17c681 100644 --- 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 d118a1585ca0..3f38f62ada89 100644 --- 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 2d8c089d5c93..93237b2af18a 100644 --- 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 64eea939a50e..d46e75c34c95 100644 --- 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 14e18b0b1df0..92644c2089ab 100644 --- 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 7587ce3f2ecb..da2719f5fef8 100644 --- 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 d677e1832497..1d2793c8f350 100644 --- 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 95f72759aa0f..f2be232c4de1 100644 --- 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 3551dc49874f..ae3c088214fd 100644 --- 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 f3b5ef9ae502..dbcbebe706fe 100644 --- 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 71c48db5f3ec..f803b5919c4f 100644 --- 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 d11383778c18..fadd276ccd95 100644 --- 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 283998c0c6d5..eb24cfde6960 100644 --- 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 dc4399609d44..0eaded61130b 100644 --- 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 1029a1d126ce..63f8871a2ae9 100644 --- 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 4a0e09a4851c..af2b94ac94ac 100644 --- 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 3b5768ee1812..b3a8d06d6c19 100644 --- 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 0572f4fb1d5e..7e7e1546f6e7 100644 --- 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 *); |