Skip to content

L
linux
Commit feed5186 authored by Dave Jones's avatar Dave Jones
Browse files
Options

[PATCH] extern inline -> static inline 

As per Documentation/SubmittingPatches
parent 22316c1c
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 58 deletions
drivers/char/ftape/lowlevel/ftape-rw.h
View file @ feed5186
......@@ -71,7 +71,7 @@ typedef struct {
/* Count nr of 1's in pattern.
*/
extern inline int count_ones(unsigned long mask)
static inline int count_ones(unsigned long mask)
{
int bits;
......
drivers/char/ftape/zftape/zftape-vtbl.h
View file @ feed5186
......@@ -168,11 +168,11 @@ extern int zft_fake_volume_headers (eof_mark_union *eof_map,
extern int zft_weof (unsigned int count, zft_position *pos);
extern void zft_move_past_eof (zft_position *pos);
extern inline int zft_tape_at_eod (const zft_position *pos);
extern inline int zft_tape_at_lbot (const zft_position *pos);
extern inline void zft_position_before_eof (zft_position *pos,
static inline int zft_tape_at_eod (const zft_position *pos);
static inline int zft_tape_at_lbot (const zft_position *pos);
static inline void zft_position_before_eof (zft_position *pos,
const zft_volinfo *volume);
extern inline __s64 zft_check_for_eof(const zft_volinfo *vtbl,
static inline __s64 zft_check_for_eof(const zft_volinfo *vtbl,
const zft_position *pos);
/* this function decrements the zft_seg_pos counter if we are right
......@@ -180,7 +180,7 @@ extern inline __s64 zft_check_for_eof(const zft_volinfo *vtbl,
* need to position before the eof mark. NOTE: zft_tape_pos is not
* changed
*/
extern inline void zft_position_before_eof(zft_position *pos,
static inline void zft_position_before_eof(zft_position *pos,
const zft_volinfo *volume)
{
TRACE_FUN(ft_t_flow);
......@@ -195,7 +195,7 @@ extern inline void zft_position_before_eof(zft_position *pos,
/* Mmmh. Is the position at the end of the last volume, that is right
* before the last EOF mark also logical an EOD condition?
*/
extern inline int zft_tape_at_eod(const zft_position *pos)
static inline int zft_tape_at_eod(const zft_position *pos)
{
TRACE_FUN(ft_t_any);
......@@ -207,7 +207,7 @@ extern inline int zft_tape_at_eod(const zft_position *pos)
}
}
extern inline int zft_tape_at_lbot(const zft_position *pos)
static inline int zft_tape_at_lbot(const zft_position *pos)
{
if (zft_qic_mode) {
return (pos->seg_pos <= zft_first_vtbl->start_seg &&
......@@ -220,7 +220,7 @@ extern inline int zft_tape_at_lbot(const zft_position *pos)
/* This one checks for EOF. return remaing space (may be negative)
*/
extern inline __s64 zft_check_for_eof(const zft_volinfo *vtbl,
static inline __s64 zft_check_for_eof(const zft_volinfo *vtbl,
const zft_position *pos)
{
return (__s64)(vtbl->size - pos->volume_pos);
......
drivers/char/isicom.c
View file @ feed5186
......@@ -122,7 +122,7 @@ struct miscdevice isiloader_device = {
};
extern inline int WaitTillCardIsFree(unsigned short base)
static inline int WaitTillCardIsFree(unsigned short base)
{
unsigned long count=0;
while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000));
......@@ -358,7 +358,7 @@ static inline int isicom_paranoia_check(struct isi_port const * port, kdev_t dev
return 0;
}
extern inline void schedule_bh(struct isi_port * port)
static inline void schedule_bh(struct isi_port * port)
{
queue_task(&port->bh_tqueue, &tq_isicom);
mark_bh(ISICOM_BH);
......@@ -823,7 +823,7 @@ static void isicom_config_port(struct isi_port * port)
/* open et all */
extern inline void isicom_setup_board(struct isi_board * bp)
static inline void isicom_setup_board(struct isi_board * bp)
{
int channel;
struct isi_port * port;
......@@ -1091,7 +1091,7 @@ static int isicom_open(struct tty_struct * tty, struct file * filp)
/* close et all */
extern inline void isicom_shutdown_board(struct isi_board * bp)
static inline void isicom_shutdown_board(struct isi_board * bp)
{
int channel;
struct isi_port * port;
......@@ -1353,7 +1353,7 @@ static int isicom_chars_in_buffer(struct tty_struct * tty)
}
/* ioctl et all */
extern inline void isicom_send_break(struct isi_port * port, unsigned long length)
static inline void isicom_send_break(struct isi_port * port, unsigned long length)
{
struct isi_board * card = port->card;
short wait = 10;
......
drivers/char/specialix.c
View file @ feed5186
......@@ -239,28 +239,28 @@ static inline int sx_paranoia_check(struct specialix_port const * port,
*/
/* Get board number from pointer */
extern inline int board_No (struct specialix_board * bp)
static inline int board_No (struct specialix_board * bp)
{
return bp - sx_board;
}
/* Get port number from pointer */
extern inline int port_No (struct specialix_port const * port)
static inline int port_No (struct specialix_port const * port)
{
return SX_PORT(port - sx_port);
}
/* Get pointer to board from pointer to port */
extern inline struct specialix_board * port_Board(struct specialix_port const * port)
static inline struct specialix_board * port_Board(struct specialix_port const * port)
{
return &sx_board[SX_BOARD(port - sx_port)];
}
/* Input Byte from CL CD186x register */
extern inline unsigned char sx_in(struct specialix_board * bp, unsigned short reg)
static inline unsigned char sx_in(struct specialix_board * bp, unsigned short reg)
{
bp->reg = reg | 0x80;
outb (reg | 0x80, bp->base + SX_ADDR_REG);
......@@ -269,7 +269,7 @@ extern inline unsigned char sx_in(struct specialix_board * bp, unsigned short r
/* Output Byte to CL CD186x register */
extern inline void sx_out(struct specialix_board * bp, unsigned short reg,
static inline void sx_out(struct specialix_board * bp, unsigned short reg,
unsigned char val)
{
bp->reg = reg | 0x80;
......@@ -279,7 +279,7 @@ extern inline void sx_out(struct specialix_board * bp, unsigned short reg,
/* Input Byte from CL CD186x register */
extern inline unsigned char sx_in_off(struct specialix_board * bp, unsigned short reg)
static inline unsigned char sx_in_off(struct specialix_board * bp, unsigned short reg)
{
bp->reg = reg;
outb (reg, bp->base + SX_ADDR_REG);
......@@ -288,7 +288,7 @@ extern inline unsigned char sx_in_off(struct specialix_board * bp, unsigned sho
/* Output Byte to CL CD186x register */
extern inline void sx_out_off(struct specialix_board * bp, unsigned short reg,
static inline void sx_out_off(struct specialix_board * bp, unsigned short reg,
unsigned char val)
{
bp->reg = reg;
......@@ -298,7 +298,7 @@ extern inline void sx_out_off(struct specialix_board * bp, unsigned short reg,
/* Wait for Channel Command Register ready */
extern inline void sx_wait_CCR(struct specialix_board * bp)
static inline void sx_wait_CCR(struct specialix_board * bp)
{
unsigned long delay;
......@@ -311,7 +311,7 @@ extern inline void sx_wait_CCR(struct specialix_board * bp)
/* Wait for Channel Command Register ready */
extern inline void sx_wait_CCR_off(struct specialix_board * bp)
static inline void sx_wait_CCR_off(struct specialix_board * bp)
{
unsigned long delay;
......@@ -327,13 +327,13 @@ extern inline void sx_wait_CCR_off(struct specialix_board * bp)
* specialix IO8+ IO range functions.
*/
extern inline int sx_check_io_range(struct specialix_board * bp)
static inline int sx_check_io_range(struct specialix_board * bp)
{
return check_region (bp->base, SX_IO_SPACE);
}
extern inline void sx_request_io_range(struct specialix_board * bp)
static inline void sx_request_io_range(struct specialix_board * bp)
{
request_region(bp->base,
bp->flags&SX_BOARD_IS_PCI?SX_PCI_IO_SPACE:SX_IO_SPACE,
......@@ -341,7 +341,7 @@ extern inline void sx_request_io_range(struct specialix_board * bp)
}
extern inline void sx_release_io_range(struct specialix_board * bp)
static inline void sx_release_io_range(struct specialix_board * bp)
{
release_region(bp->base,
bp->flags&SX_BOARD_IS_PCI?SX_PCI_IO_SPACE:SX_IO_SPACE);
......@@ -351,7 +351,7 @@ extern inline void sx_release_io_range(struct specialix_board * bp)
/* Must be called with enabled interrupts */
/* Ugly. Very ugly. Don't use this for anything else than initialization
code */
extern inline void sx_long_delay(unsigned long delay)
static inline void sx_long_delay(unsigned long delay)
{
unsigned long i;
......@@ -599,7 +599,7 @@ static int sx_probe(struct specialix_board *bp)
* Interrupt processing routines.
* */
extern inline void sx_mark_event(struct specialix_port * port, int event)
static inline void sx_mark_event(struct specialix_port * port, int event)
{
/*
* I'm not quite happy with current scheme all serial
......@@ -616,7 +616,7 @@ extern inline void sx_mark_event(struct specialix_port * port, int event)
}
extern inline struct specialix_port * sx_get_port(struct specialix_board * bp,
static inline struct specialix_port * sx_get_port(struct specialix_board * bp,
unsigned char const * what)
{
unsigned char channel;
......@@ -635,7 +635,7 @@ extern inline struct specialix_port * sx_get_port(struct specialix_board * bp,
}
extern inline void sx_receive_exc(struct specialix_board * bp)
static inline void sx_receive_exc(struct specialix_board * bp)
{
struct specialix_port *port;
struct tty_struct *tty;
......@@ -701,7 +701,7 @@ extern inline void sx_receive_exc(struct specialix_board * bp)
}
extern inline void sx_receive(struct specialix_board * bp)
static inline void sx_receive(struct specialix_board * bp)
{
struct specialix_port *port;
struct tty_struct *tty;
......@@ -732,7 +732,7 @@ extern inline void sx_receive(struct specialix_board * bp)
}
extern inline void sx_transmit(struct specialix_board * bp)
static inline void sx_transmit(struct specialix_board * bp)
{
struct specialix_port *port;
struct tty_struct *tty;
......@@ -802,7 +802,7 @@ extern inline void sx_transmit(struct specialix_board * bp)
}
extern inline void sx_check_modem(struct specialix_board * bp)
static inline void sx_check_modem(struct specialix_board * bp)
{
struct specialix_port *port;
struct tty_struct *tty;
......@@ -962,7 +962,7 @@ void turn_ints_on (struct specialix_board *bp)
/* Called with disabled interrupts */
extern inline int sx_setup_board(struct specialix_board * bp)
static inline int sx_setup_board(struct specialix_board * bp)
{
int error;
......@@ -986,7 +986,7 @@ extern inline int sx_setup_board(struct specialix_board * bp)
/* Called with disabled interrupts */
extern inline void sx_shutdown_board(struct specialix_board *bp)
static inline void sx_shutdown_board(struct specialix_board *bp)
{
if (!(bp->flags & SX_BOARD_ACTIVE))
return;
......@@ -1867,7 +1867,7 @@ static int sx_set_modem_info(struct specialix_port * port, unsigned int cmd,
}
extern inline void sx_send_break(struct specialix_port * port, unsigned long length)
static inline void sx_send_break(struct specialix_port * port, unsigned long length)
{
struct specialix_board *bp = port_Board(port);
unsigned long flags;
......@@ -1886,7 +1886,7 @@ extern inline void sx_send_break(struct specialix_port * port, unsigned long len
}
extern inline int sx_set_serial_info(struct specialix_port * port,
static inline int sx_set_serial_info(struct specialix_port * port,
struct serial_struct * newinfo)
{
struct serial_struct tmp;
......@@ -1942,7 +1942,7 @@ extern inline int sx_set_serial_info(struct specialix_port * port,
}
extern inline int sx_get_serial_info(struct specialix_port * port,
static inline int sx_get_serial_info(struct specialix_port * port,
struct serial_struct * retinfo)
{
struct serial_struct tmp;
......
drivers/message/fusion/linux_compat.h
View file @ feed5186
......@@ -75,11 +75,11 @@ typedef int (*__init_module_func_t)(void);
typedef void (*__cleanup_module_func_t)(void);
#define module_init(x) \
int init_module(void) __attribute__((alias(#x))); \
extern inline __init_module_func_t __init_module_inline(void) \
static inline __init_module_func_t __init_module_inline(void) \
{ return x; }
#define module_exit(x) \
void cleanup_module(void) __attribute__((alias(#x))); \
extern inline __cleanup_module_func_t __cleanup_module_inline(void) \
static inline __cleanup_module_func_t __cleanup_module_inline(void) \
{ return x; }
#else
......
drivers/nubus/nubus.c
View file @ feed5186
......@@ -72,7 +72,7 @@ struct nubus_board* nubus_boards;
Etcetera, etcetera. Hopefully this clears up some confusion over
what the following code actually does. */
extern inline int not_useful(void *p, int map)
static inline int not_useful(void *p, int map)
{
unsigned long pv=(unsigned long)p;
pv &= 3;
......@@ -148,14 +148,14 @@ static void nubus_move(unsigned char **ptr, int len, int map)
have to expand it from a 24-bit signed number to a 32-bit signed
number. */
extern inline long nubus_expand32(long foo)
static inline long nubus_expand32(long foo)
{
if(foo & 0x00800000) /* 24bit negative */
foo |= 0xFF000000;
return foo;
}
extern inline void *nubus_rom_addr(int slot)
static inline void *nubus_rom_addr(int slot)
{
/*
* Returns the first byte after the card. We then walk
......
drivers/scsi/NCR53C9x.c
View file @ feed5186
......@@ -289,7 +289,7 @@ static inline void esp_advance_phase(Scsi_Cmnd *s, int newphase)
#endif
#ifdef DEBUG_ESP_CMDS
extern inline void esp_cmd(struct NCR_ESP *esp, struct ESP_regs *eregs,
inline void esp_cmd(struct NCR_ESP *esp, struct ESP_regs *eregs,
unchar cmd)
{
esp->espcmdlog[esp->espcmdent] = cmd;
......
drivers/scsi/esp.c
View file @ feed5186
......@@ -378,7 +378,7 @@ static inline void esp_advance_phase(Scsi_Cmnd *s, int newphase)
#endif
#ifdef DEBUG_ESP_CMDS
extern inline void esp_cmd(struct esp *esp, u8 cmd)
static inline void esp_cmd(struct esp *esp, u8 cmd)
{
esp->espcmdlog[esp->espcmdent] = cmd;
esp->espcmdent = (esp->espcmdent + 1) & 31;
......
drivers/usb/class/audio.c
View file @ feed5186
......@@ -395,7 +395,7 @@ struct usb_audio_state {
/* prevent picking up a bogus abs macro */
#undef abs
extern inline int abs(int x)
static inline int abs(int x)
{
if (x < 0)
return -x;
......@@ -404,7 +404,7 @@ extern inline int abs(int x)
/* --------------------------------------------------------------------- */
extern inline unsigned ld2(unsigned int x)
static inline unsigned ld2(unsigned int x)
{
unsigned r = 0;
......@@ -1939,13 +1939,13 @@ static void release(struct usb_audio_state *s)
kfree(s);
}
extern inline int prog_dmabuf_in(struct usb_audiodev *as)
static inline int prog_dmabuf_in(struct usb_audiodev *as)
{
usbin_stop(as);
return dmabuf_init(&as->usbin.dma);
}
extern inline int prog_dmabuf_out(struct usb_audiodev *as)
static inline int prog_dmabuf_out(struct usb_audiodev *as)
{
usbout_stop(as);
return dmabuf_init(&as->usbout.dma);
......@@ -3253,7 +3253,7 @@ static void prepmixch(struct consmixstate *state)
static void usb_audio_recurseunit(struct consmixstate *state, unsigned char unitid);
extern inline int checkmixbmap(unsigned char *bmap, unsigned char flg, unsigned int inidx, unsigned int numoch)
static inline int checkmixbmap(unsigned char *bmap, unsigned char flg, unsigned int inidx, unsigned int numoch)
{
unsigned int idx;
......
sound/oss/ite8172.c
View file @ feed5186
......@@ -305,7 +305,7 @@ static LIST_HEAD(devs);
/* --------------------------------------------------------------------- */
extern inline unsigned ld2(unsigned int x)
static inline unsigned ld2(unsigned int x)
{
unsigned r = 0;
......@@ -510,7 +510,7 @@ static void waitcodec(struct ac97_codec *codec)
/* --------------------------------------------------------------------- */
extern inline void stop_adc(struct it8172_state *s)
static inline void stop_adc(struct it8172_state *s)
{
struct dmabuf* db = &s->dma_adc;
unsigned long flags;
......@@ -534,7 +534,7 @@ extern inline void stop_adc(struct it8172_state *s)
spin_unlock_irqrestore(&s->lock, flags);
}
extern inline void stop_dac(struct it8172_state *s)
static inline void stop_dac(struct it8172_state *s)
{
struct dmabuf* db = &s->dma_dac;
unsigned long flags;
......@@ -633,7 +633,7 @@ static void start_adc(struct it8172_state *s)
#define DMABUF_DEFAULTORDER (17-PAGE_SHIFT)
#define DMABUF_MINORDER 1
extern inline void dealloc_dmabuf(struct it8172_state *s, struct dmabuf *db)
static inline void dealloc_dmabuf(struct it8172_state *s, struct dmabuf *db)
{
struct page *page, *pend;
......@@ -709,7 +709,7 @@ static int prog_dmabuf(struct it8172_state *s, struct dmabuf *db,
return 0;
}
extern inline int prog_dmabuf_adc(struct it8172_state *s)
static inline int prog_dmabuf_adc(struct it8172_state *s)
{
stop_adc(s);
return prog_dmabuf(s, &s->dma_adc, s->adcrate,
......@@ -717,7 +717,7 @@ extern inline int prog_dmabuf_adc(struct it8172_state *s)
IT_AC_CAPCC);
}
extern inline int prog_dmabuf_dac(struct it8172_state *s)
static inline int prog_dmabuf_dac(struct it8172_state *s)
{
stop_dac(s);
return prog_dmabuf(s, &s->dma_dac, s->dacrate,
......
sound/oss/sound_config.h
View file @ feed5186
......@@ -113,14 +113,14 @@ struct channel_info {
#if OPEN_READ == FMODE_READ && OPEN_WRITE == FMODE_WRITE
extern __inline__ int translate_mode(struct file *file)
static inline int translate_mode(struct file *file)
{
return file->f_mode;
}
#else
extern __inline__ int translate_mode(struct file *file)
static inline int translate_mode(struct file *file)
{
return ((file->f_mode & FMODE_READ) ? OPEN_READ : 0) |
((file->f_mode & FMODE_WRITE) ? OPEN_WRITE : 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7