[PATCH] make lots of things static
Another large rollup of various patches from Adrian which make things static where they were needlessly exported. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
c31403a1f5
commit
408b664a7d
33 changed files with 67 additions and 70 deletions
|
@ -124,8 +124,8 @@ int generic_get_free_region(unsigned long base, unsigned long size)
|
||||||
return -ENOSPC;
|
return -ENOSPC;
|
||||||
}
|
}
|
||||||
|
|
||||||
void generic_get_mtrr(unsigned int reg, unsigned long *base,
|
static void generic_get_mtrr(unsigned int reg, unsigned long *base,
|
||||||
unsigned int *size, mtrr_type * type)
|
unsigned int *size, mtrr_type * type)
|
||||||
{
|
{
|
||||||
unsigned int mask_lo, mask_hi, base_lo, base_hi;
|
unsigned int mask_lo, mask_hi, base_lo, base_hi;
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ static struct console early_vga_console = {
|
||||||
|
|
||||||
/* Serial functions loosely based on a similar package from Klaus P. Gerlicher */
|
/* Serial functions loosely based on a similar package from Klaus P. Gerlicher */
|
||||||
|
|
||||||
int early_serial_base = 0x3f8; /* ttyS0 */
|
static int early_serial_base = 0x3f8; /* ttyS0 */
|
||||||
|
|
||||||
#define XMTRDY 0x20
|
#define XMTRDY 0x20
|
||||||
|
|
||||||
|
|
|
@ -192,7 +192,7 @@ static struct aper_size_info_32 ali_generic_sizes[7] =
|
||||||
{4, 1024, 0, 3}
|
{4, 1024, 0, 3}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct agp_bridge_driver ali_generic_bridge = {
|
static struct agp_bridge_driver ali_generic_bridge = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = ali_generic_sizes,
|
.aperture_sizes = ali_generic_sizes,
|
||||||
.size_type = U32_APER_SIZE,
|
.size_type = U32_APER_SIZE,
|
||||||
|
@ -215,7 +215,7 @@ struct agp_bridge_driver ali_generic_bridge = {
|
||||||
.agp_destroy_page = ali_destroy_page,
|
.agp_destroy_page = ali_destroy_page,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct agp_bridge_driver ali_m1541_bridge = {
|
static struct agp_bridge_driver ali_m1541_bridge = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = ali_generic_sizes,
|
.aperture_sizes = ali_generic_sizes,
|
||||||
.size_type = U32_APER_SIZE,
|
.size_type = U32_APER_SIZE,
|
||||||
|
|
|
@ -358,7 +358,7 @@ static struct gatt_mask amd_irongate_masks[] =
|
||||||
{.mask = 1, .type = 0}
|
{.mask = 1, .type = 0}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct agp_bridge_driver amd_irongate_driver = {
|
static struct agp_bridge_driver amd_irongate_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = amd_irongate_sizes,
|
.aperture_sizes = amd_irongate_sizes,
|
||||||
.size_type = LVL2_APER_SIZE,
|
.size_type = LVL2_APER_SIZE,
|
||||||
|
|
|
@ -243,7 +243,7 @@ static void amd64_cleanup(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct agp_bridge_driver amd_8151_driver = {
|
static struct agp_bridge_driver amd_8151_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = amd_8151_sizes,
|
.aperture_sizes = amd_8151_sizes,
|
||||||
.size_type = U32_APER_SIZE,
|
.size_type = U32_APER_SIZE,
|
||||||
|
|
|
@ -393,7 +393,7 @@ static int ati_free_gatt_table(struct agp_bridge_data *bridge)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct agp_bridge_driver ati_generic_bridge = {
|
static struct agp_bridge_driver ati_generic_bridge = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = ati_generic_sizes,
|
.aperture_sizes = ati_generic_sizes,
|
||||||
.size_type = LVL2_APER_SIZE,
|
.size_type = LVL2_APER_SIZE,
|
||||||
|
|
|
@ -97,7 +97,7 @@ void agp_backend_release(struct agp_bridge_data *bridge)
|
||||||
EXPORT_SYMBOL(agp_backend_release);
|
EXPORT_SYMBOL(agp_backend_release);
|
||||||
|
|
||||||
|
|
||||||
struct { int mem, agp; } maxes_table[] = {
|
static struct { int mem, agp; } maxes_table[] = {
|
||||||
{0, 0},
|
{0, 0},
|
||||||
{32, 4},
|
{32, 4},
|
||||||
{64, 28},
|
{64, 28},
|
||||||
|
@ -322,7 +322,7 @@ static int __init agp_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void __exit agp_exit(void)
|
static void __exit agp_exit(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -303,7 +303,7 @@ static int efficeon_remove_memory(struct agp_memory * mem, off_t pg_start, int t
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct agp_bridge_driver efficeon_driver = {
|
static struct agp_bridge_driver efficeon_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = efficeon_generic_sizes,
|
.aperture_sizes = efficeon_generic_sizes,
|
||||||
.size_type = LVL2_APER_SIZE,
|
.size_type = LVL2_APER_SIZE,
|
||||||
|
|
|
@ -235,7 +235,7 @@ static void agp_insert_into_pool(struct agp_memory * temp)
|
||||||
|
|
||||||
/* File private list routines */
|
/* File private list routines */
|
||||||
|
|
||||||
struct agp_file_private *agp_find_private(pid_t pid)
|
static struct agp_file_private *agp_find_private(pid_t pid)
|
||||||
{
|
{
|
||||||
struct agp_file_private *curr;
|
struct agp_file_private *curr;
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ struct agp_file_private *agp_find_private(pid_t pid)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void agp_insert_file_private(struct agp_file_private * priv)
|
static void agp_insert_file_private(struct agp_file_private * priv)
|
||||||
{
|
{
|
||||||
struct agp_file_private *prev;
|
struct agp_file_private *prev;
|
||||||
|
|
||||||
|
@ -262,7 +262,7 @@ void agp_insert_file_private(struct agp_file_private * priv)
|
||||||
agp_fe.file_priv_list = priv;
|
agp_fe.file_priv_list = priv;
|
||||||
}
|
}
|
||||||
|
|
||||||
void agp_remove_file_private(struct agp_file_private * priv)
|
static void agp_remove_file_private(struct agp_file_private * priv)
|
||||||
{
|
{
|
||||||
struct agp_file_private *next;
|
struct agp_file_private *next;
|
||||||
struct agp_file_private *prev;
|
struct agp_file_private *prev;
|
||||||
|
|
|
@ -288,7 +288,7 @@ static struct gatt_mask nvidia_generic_masks[] =
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct agp_bridge_driver nvidia_driver = {
|
static struct agp_bridge_driver nvidia_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = nvidia_generic_sizes,
|
.aperture_sizes = nvidia_generic_sizes,
|
||||||
.size_type = U8_APER_SIZE,
|
.size_type = U8_APER_SIZE,
|
||||||
|
|
|
@ -119,7 +119,7 @@ static struct aper_size_info_8 sis_generic_sizes[7] =
|
||||||
{4, 1024, 0, 3}
|
{4, 1024, 0, 3}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct agp_bridge_driver sis_driver = {
|
static struct agp_bridge_driver sis_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = sis_generic_sizes,
|
.aperture_sizes = sis_generic_sizes,
|
||||||
.size_type = U8_APER_SIZE,
|
.size_type = U8_APER_SIZE,
|
||||||
|
|
|
@ -409,7 +409,7 @@ static void serverworks_agp_enable(struct agp_bridge_data *bridge, u32 mode)
|
||||||
agp_device_command(command, 0);
|
agp_device_command(command, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct agp_bridge_driver sworks_driver = {
|
static struct agp_bridge_driver sworks_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = serverworks_sizes,
|
.aperture_sizes = serverworks_sizes,
|
||||||
.size_type = LVL2_APER_SIZE,
|
.size_type = LVL2_APER_SIZE,
|
||||||
|
|
|
@ -170,7 +170,7 @@ static void via_tlbflush_agp3(struct agp_memory *mem)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
struct agp_bridge_driver via_agp3_driver = {
|
static struct agp_bridge_driver via_agp3_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = agp3_generic_sizes,
|
.aperture_sizes = agp3_generic_sizes,
|
||||||
.size_type = U8_APER_SIZE,
|
.size_type = U8_APER_SIZE,
|
||||||
|
@ -193,7 +193,7 @@ struct agp_bridge_driver via_agp3_driver = {
|
||||||
.agp_destroy_page = agp_generic_destroy_page,
|
.agp_destroy_page = agp_generic_destroy_page,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct agp_bridge_driver via_driver = {
|
static struct agp_bridge_driver via_driver = {
|
||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
.aperture_sizes = via_generic_sizes,
|
.aperture_sizes = via_generic_sizes,
|
||||||
.size_type = U8_APER_SIZE,
|
.size_type = U8_APER_SIZE,
|
||||||
|
|
|
@ -221,7 +221,7 @@ static int rio_probe_addrs[]= {0xc0000, 0xd0000, 0xe0000};
|
||||||
/* Set the mask to all-ones. This alas, only supports 32 interrupts.
|
/* Set the mask to all-ones. This alas, only supports 32 interrupts.
|
||||||
Some architectures may need more. -- Changed to LONG to
|
Some architectures may need more. -- Changed to LONG to
|
||||||
support up to 64 bits on 64bit architectures. -- REW 20/06/99 */
|
support up to 64 bits on 64bit architectures. -- REW 20/06/99 */
|
||||||
long rio_irqmask = -1;
|
static long rio_irqmask = -1;
|
||||||
|
|
||||||
MODULE_AUTHOR("Rogier Wolff <R.E.Wolff@bitwizard.nl>, Patrick van de Lageweg <patrick@bitwizard.nl>");
|
MODULE_AUTHOR("Rogier Wolff <R.E.Wolff@bitwizard.nl>, Patrick van de Lageweg <patrick@bitwizard.nl>");
|
||||||
MODULE_DESCRIPTION("RIO driver");
|
MODULE_DESCRIPTION("RIO driver");
|
||||||
|
|
|
@ -466,7 +466,7 @@ static int stl_parsebrd(stlconf_t *confp, char **argp);
|
||||||
|
|
||||||
static unsigned long stl_atol(char *str);
|
static unsigned long stl_atol(char *str);
|
||||||
|
|
||||||
int stl_init(void);
|
static int stl_init(void);
|
||||||
static int stl_open(struct tty_struct *tty, struct file *filp);
|
static int stl_open(struct tty_struct *tty, struct file *filp);
|
||||||
static void stl_close(struct tty_struct *tty, struct file *filp);
|
static void stl_close(struct tty_struct *tty, struct file *filp);
|
||||||
static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count);
|
static int stl_write(struct tty_struct *tty, const unsigned char *buf, int count);
|
||||||
|
@ -3063,7 +3063,7 @@ static struct tty_operations stl_ops = {
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
int __init stl_init(void)
|
static int __init stl_init(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);
|
printk(KERN_INFO "%s: version %s\n", stl_drvtitle, stl_drvversion);
|
||||||
|
|
|
@ -60,12 +60,12 @@ MODULE_LICENSE("GPL");
|
||||||
|
|
||||||
static struct class_simple *capi_class;
|
static struct class_simple *capi_class;
|
||||||
|
|
||||||
int capi_major = 68; /* allocated */
|
static int capi_major = 68; /* allocated */
|
||||||
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
|
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
|
||||||
#define CAPINC_NR_PORTS 32
|
#define CAPINC_NR_PORTS 32
|
||||||
#define CAPINC_MAX_PORTS 256
|
#define CAPINC_MAX_PORTS 256
|
||||||
int capi_ttymajor = 191;
|
static int capi_ttymajor = 191;
|
||||||
int capi_ttyminors = CAPINC_NR_PORTS;
|
static int capi_ttyminors = CAPINC_NR_PORTS;
|
||||||
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
|
#endif /* CONFIG_ISDN_CAPI_MIDDLEWARE */
|
||||||
|
|
||||||
module_param_named(major, capi_major, uint, 0);
|
module_param_named(major, capi_major, uint, 0);
|
||||||
|
@ -268,7 +268,7 @@ static void capiminor_free(struct capiminor *mp)
|
||||||
kfree(mp);
|
kfree(mp);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct capiminor *capiminor_find(unsigned int minor)
|
static struct capiminor *capiminor_find(unsigned int minor)
|
||||||
{
|
{
|
||||||
struct list_head *l;
|
struct list_head *l;
|
||||||
struct capiminor *p = NULL;
|
struct capiminor *p = NULL;
|
||||||
|
@ -1166,7 +1166,7 @@ static int capinc_tty_write_room(struct tty_struct *tty)
|
||||||
return room;
|
return room;
|
||||||
}
|
}
|
||||||
|
|
||||||
int capinc_tty_chars_in_buffer(struct tty_struct *tty)
|
static int capinc_tty_chars_in_buffer(struct tty_struct *tty)
|
||||||
{
|
{
|
||||||
struct capiminor *mp = (struct capiminor *)tty->driver_data;
|
struct capiminor *mp = (struct capiminor *)tty->driver_data;
|
||||||
if (!mp || !mp->nccip) {
|
if (!mp || !mp->nccip) {
|
||||||
|
|
|
@ -89,14 +89,14 @@ static int contrstats_show(struct seq_file *seq, void *v)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct seq_operations seq_controller_ops = {
|
static struct seq_operations seq_controller_ops = {
|
||||||
.start = controller_start,
|
.start = controller_start,
|
||||||
.next = controller_next,
|
.next = controller_next,
|
||||||
.stop = controller_stop,
|
.stop = controller_stop,
|
||||||
.show = controller_show,
|
.show = controller_show,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct seq_operations seq_contrstats_ops = {
|
static struct seq_operations seq_contrstats_ops = {
|
||||||
.start = controller_start,
|
.start = controller_start,
|
||||||
.next = controller_next,
|
.next = controller_next,
|
||||||
.stop = controller_stop,
|
.stop = controller_stop,
|
||||||
|
@ -192,14 +192,14 @@ applstats_show(struct seq_file *seq, void *v)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct seq_operations seq_applications_ops = {
|
static struct seq_operations seq_applications_ops = {
|
||||||
.start = applications_start,
|
.start = applications_start,
|
||||||
.next = applications_next,
|
.next = applications_next,
|
||||||
.stop = applications_stop,
|
.stop = applications_stop,
|
||||||
.show = applications_show,
|
.show = applications_show,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct seq_operations seq_applstats_ops = {
|
static struct seq_operations seq_applstats_ops = {
|
||||||
.start = applications_start,
|
.start = applications_start,
|
||||||
.next = applications_next,
|
.next = applications_next,
|
||||||
.stop = applications_stop,
|
.stop = applications_stop,
|
||||||
|
@ -287,7 +287,7 @@ static int capi_driver_show(struct seq_file *seq, void *v)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct seq_operations seq_capi_driver_ops = {
|
static struct seq_operations seq_capi_driver_ops = {
|
||||||
.start = capi_driver_start,
|
.start = capi_driver_start,
|
||||||
.next = capi_driver_next,
|
.next = capi_driver_next,
|
||||||
.stop = capi_driver_stop,
|
.stop = capi_driver_stop,
|
||||||
|
|
|
@ -383,7 +383,7 @@ divert_rule *getruleptr(int idx)
|
||||||
/*************************************************/
|
/*************************************************/
|
||||||
/* called from common module on an incoming call */
|
/* called from common module on an incoming call */
|
||||||
/*************************************************/
|
/*************************************************/
|
||||||
int isdn_divert_icall(isdn_ctrl *ic)
|
static int isdn_divert_icall(isdn_ctrl *ic)
|
||||||
{ int retval = 0;
|
{ int retval = 0;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
struct call_struc *cs = NULL;
|
struct call_struc *cs = NULL;
|
||||||
|
@ -552,7 +552,7 @@ void deleteprocs(void)
|
||||||
/****************************************************/
|
/****************************************************/
|
||||||
/* put a address including address type into buffer */
|
/* put a address including address type into buffer */
|
||||||
/****************************************************/
|
/****************************************************/
|
||||||
int put_address(char *st, u_char *p, int len)
|
static int put_address(char *st, u_char *p, int len)
|
||||||
{ u_char retval = 0;
|
{ u_char retval = 0;
|
||||||
u_char adr_typ = 0; /* network standard */
|
u_char adr_typ = 0; /* network standard */
|
||||||
|
|
||||||
|
@ -595,7 +595,7 @@ int put_address(char *st, u_char *p, int len)
|
||||||
/*************************************/
|
/*************************************/
|
||||||
/* report a succesfull interrogation */
|
/* report a succesfull interrogation */
|
||||||
/*************************************/
|
/*************************************/
|
||||||
int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
|
static int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
|
||||||
{ char *src = ic->parm.dss1_io.data;
|
{ char *src = ic->parm.dss1_io.data;
|
||||||
int restlen = ic->parm.dss1_io.datalen;
|
int restlen = ic->parm.dss1_io.datalen;
|
||||||
int cnt = 1;
|
int cnt = 1;
|
||||||
|
@ -689,7 +689,7 @@ int interrogate_success(isdn_ctrl *ic, struct call_struc *cs)
|
||||||
/*********************************************/
|
/*********************************************/
|
||||||
/* callback for protocol specific extensions */
|
/* callback for protocol specific extensions */
|
||||||
/*********************************************/
|
/*********************************************/
|
||||||
int prot_stat_callback(isdn_ctrl *ic)
|
static int prot_stat_callback(isdn_ctrl *ic)
|
||||||
{ struct call_struc *cs, *cs1;
|
{ struct call_struc *cs, *cs1;
|
||||||
int i;
|
int i;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -781,7 +781,7 @@ int prot_stat_callback(isdn_ctrl *ic)
|
||||||
/***************************/
|
/***************************/
|
||||||
/* status callback from HL */
|
/* status callback from HL */
|
||||||
/***************************/
|
/***************************/
|
||||||
int isdn_divert_stat_callback(isdn_ctrl *ic)
|
static int isdn_divert_stat_callback(isdn_ctrl *ic)
|
||||||
{ struct call_struc *cs, *cs1;
|
{ struct call_struc *cs, *cs1;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int retval;
|
int retval;
|
||||||
|
|
|
@ -3169,7 +3169,7 @@ static struct video_device radio_template =
|
||||||
/* ----------------------------------------------------------------------- */
|
/* ----------------------------------------------------------------------- */
|
||||||
/* some debug code */
|
/* some debug code */
|
||||||
|
|
||||||
int bttv_risc_decode(u32 risc)
|
static int bttv_risc_decode(u32 risc)
|
||||||
{
|
{
|
||||||
static char *instr[16] = {
|
static char *instr[16] = {
|
||||||
[ BT848_RISC_WRITE >> 28 ] = "write",
|
[ BT848_RISC_WRITE >> 28 ] = "write",
|
||||||
|
@ -3206,8 +3206,8 @@ int bttv_risc_decode(u32 risc)
|
||||||
return incr[risc >> 28] ? incr[risc >> 28] : 1;
|
return incr[risc >> 28] ? incr[risc >> 28] : 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void bttv_risc_disasm(struct bttv *btv,
|
static void bttv_risc_disasm(struct bttv *btv,
|
||||||
struct btcx_riscmem *risc)
|
struct btcx_riscmem *risc)
|
||||||
{
|
{
|
||||||
unsigned int i,j,n;
|
unsigned int i,j,n;
|
||||||
|
|
||||||
|
|
|
@ -429,7 +429,7 @@ int cx88_sram_channel_setup(struct cx88_core *core,
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
/* debug helper code */
|
/* debug helper code */
|
||||||
|
|
||||||
int cx88_risc_decode(u32 risc)
|
static int cx88_risc_decode(u32 risc)
|
||||||
{
|
{
|
||||||
static char *instr[16] = {
|
static char *instr[16] = {
|
||||||
[ RISC_SYNC >> 28 ] = "sync",
|
[ RISC_SYNC >> 28 ] = "sync",
|
||||||
|
@ -542,7 +542,7 @@ void cx88_sram_channel_dump(struct cx88_core *core,
|
||||||
core->name,cx_read(ch->cnt2_reg));
|
core->name,cx_read(ch->cnt2_reg));
|
||||||
}
|
}
|
||||||
|
|
||||||
char *cx88_pci_irqs[32] = {
|
static char *cx88_pci_irqs[32] = {
|
||||||
"vid", "aud", "ts", "vip", "hst", "5", "6", "tm1",
|
"vid", "aud", "ts", "vip", "hst", "5", "6", "tm1",
|
||||||
"src_dma", "dst_dma", "risc_rd_err", "risc_wr_err",
|
"src_dma", "dst_dma", "risc_rd_err", "risc_wr_err",
|
||||||
"brdg_err", "src_dma_err", "dst_dma_err", "ipb_dma_err",
|
"brdg_err", "src_dma_err", "dst_dma_err", "ipb_dma_err",
|
||||||
|
@ -1206,7 +1206,6 @@ void cx88_core_put(struct cx88_core *core, struct pci_dev *pci)
|
||||||
/* ------------------------------------------------------------------ */
|
/* ------------------------------------------------------------------ */
|
||||||
|
|
||||||
EXPORT_SYMBOL(cx88_print_ioctl);
|
EXPORT_SYMBOL(cx88_print_ioctl);
|
||||||
EXPORT_SYMBOL(cx88_pci_irqs);
|
|
||||||
EXPORT_SYMBOL(cx88_vid_irqs);
|
EXPORT_SYMBOL(cx88_vid_irqs);
|
||||||
EXPORT_SYMBOL(cx88_mpeg_irqs);
|
EXPORT_SYMBOL(cx88_mpeg_irqs);
|
||||||
EXPORT_SYMBOL(cx88_print_irqbits);
|
EXPORT_SYMBOL(cx88_print_irqbits);
|
||||||
|
|
|
@ -91,7 +91,7 @@ static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb
|
||||||
cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb);
|
cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct videobuf_queue_ops dvb_qops = {
|
static struct videobuf_queue_ops dvb_qops = {
|
||||||
.buf_setup = dvb_buf_setup,
|
.buf_setup = dvb_buf_setup,
|
||||||
.buf_prepare = dvb_buf_prepare,
|
.buf_prepare = dvb_buf_prepare,
|
||||||
.buf_queue = dvb_buf_queue,
|
.buf_queue = dvb_buf_queue,
|
||||||
|
@ -191,7 +191,7 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct or51132_config pchdtv_hd3000 = {
|
static struct or51132_config pchdtv_hd3000 = {
|
||||||
.demod_address = 0x15,
|
.demod_address = 0x15,
|
||||||
.pll_address = 0x61,
|
.pll_address = 0x61,
|
||||||
.pll_desc = &dvb_pll_thomson_dtt7610,
|
.pll_desc = &dvb_pll_thomson_dtt7610,
|
||||||
|
|
|
@ -45,7 +45,7 @@ MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
/* ----------------------------------------------------------------------- */
|
||||||
|
|
||||||
void cx8800_bit_setscl(void *data, int state)
|
static void cx8800_bit_setscl(void *data, int state)
|
||||||
{
|
{
|
||||||
struct cx88_core *core = data;
|
struct cx88_core *core = data;
|
||||||
|
|
||||||
|
@ -57,7 +57,7 @@ void cx8800_bit_setscl(void *data, int state)
|
||||||
cx_read(MO_I2C);
|
cx_read(MO_I2C);
|
||||||
}
|
}
|
||||||
|
|
||||||
void cx8800_bit_setsda(void *data, int state)
|
static void cx8800_bit_setsda(void *data, int state)
|
||||||
{
|
{
|
||||||
struct cx88_core *core = data;
|
struct cx88_core *core = data;
|
||||||
|
|
||||||
|
|
|
@ -46,9 +46,9 @@ void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int cx8800_start_vbi_dma(struct cx8800_dev *dev,
|
static int cx8800_start_vbi_dma(struct cx8800_dev *dev,
|
||||||
struct cx88_dmaqueue *q,
|
struct cx88_dmaqueue *q,
|
||||||
struct cx88_buffer *buf)
|
struct cx88_buffer *buf)
|
||||||
{
|
{
|
||||||
struct cx88_core *core = dev->core;
|
struct cx88_core *core = dev->core;
|
||||||
|
|
||||||
|
|
|
@ -325,7 +325,7 @@ static struct cx88_ctrl cx8800_ctls[] = {
|
||||||
.shift = 0,
|
.shift = 0,
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
|
static const int CX8800_CTLS = ARRAY_SIZE(cx8800_ctls);
|
||||||
|
|
||||||
/* ------------------------------------------------------------------- */
|
/* ------------------------------------------------------------------- */
|
||||||
/* resource management */
|
/* resource management */
|
||||||
|
@ -665,7 +665,7 @@ static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
|
||||||
cx88_free_buffer(fh->dev->pci,buf);
|
cx88_free_buffer(fh->dev->pci,buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct videobuf_queue_ops cx8800_video_qops = {
|
static struct videobuf_queue_ops cx8800_video_qops = {
|
||||||
.buf_setup = buffer_setup,
|
.buf_setup = buffer_setup,
|
||||||
.buf_prepare = buffer_prepare,
|
.buf_prepare = buffer_prepare,
|
||||||
.buf_queue = buffer_queue,
|
.buf_queue = buffer_queue,
|
||||||
|
@ -1924,7 +1924,7 @@ static struct file_operations video_fops =
|
||||||
.llseek = no_llseek,
|
.llseek = no_llseek,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct video_device cx8800_video_template =
|
static struct video_device cx8800_video_template =
|
||||||
{
|
{
|
||||||
.name = "cx8800-video",
|
.name = "cx8800-video",
|
||||||
.type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
|
.type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
|
||||||
|
@ -1933,7 +1933,7 @@ struct video_device cx8800_video_template =
|
||||||
.minor = -1,
|
.minor = -1,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct video_device cx8800_vbi_template =
|
static struct video_device cx8800_vbi_template =
|
||||||
{
|
{
|
||||||
.name = "cx8800-vbi",
|
.name = "cx8800-vbi",
|
||||||
.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER,
|
.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER,
|
||||||
|
@ -1951,7 +1951,7 @@ static struct file_operations radio_fops =
|
||||||
.llseek = no_llseek,
|
.llseek = no_llseek,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct video_device cx8800_radio_template =
|
static struct video_device cx8800_radio_template =
|
||||||
{
|
{
|
||||||
.name = "cx8800-radio",
|
.name = "cx8800-radio",
|
||||||
.type = VID_TYPE_TUNER,
|
.type = VID_TYPE_TUNER,
|
||||||
|
@ -2226,7 +2226,7 @@ static int cx8800_resume(struct pci_dev *pci_dev)
|
||||||
|
|
||||||
/* ----------------------------------------------------------- */
|
/* ----------------------------------------------------------- */
|
||||||
|
|
||||||
struct pci_device_id cx8800_pci_tbl[] = {
|
static struct pci_device_id cx8800_pci_tbl[] = {
|
||||||
{
|
{
|
||||||
.vendor = 0x14f1,
|
.vendor = 0x14f1,
|
||||||
.device = 0x8800,
|
.device = 0x8800,
|
||||||
|
|
|
@ -420,7 +420,6 @@ struct cx8802_dev {
|
||||||
/* ----------------------------------------------------------- */
|
/* ----------------------------------------------------------- */
|
||||||
/* cx88-core.c */
|
/* cx88-core.c */
|
||||||
|
|
||||||
extern char *cx88_pci_irqs[32];
|
|
||||||
extern char *cx88_vid_irqs[32];
|
extern char *cx88_vid_irqs[32];
|
||||||
extern char *cx88_mpeg_irqs[32];
|
extern char *cx88_mpeg_irqs[32];
|
||||||
extern void cx88_print_irqbits(char *name, char *tag, char **strings,
|
extern void cx88_print_irqbits(char *name, char *tag, char **strings,
|
||||||
|
@ -472,9 +471,6 @@ extern void cx88_core_put(struct cx88_core *core,
|
||||||
/* cx88-vbi.c */
|
/* cx88-vbi.c */
|
||||||
|
|
||||||
void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f);
|
void cx8800_vbi_fmt(struct cx8800_dev *dev, struct v4l2_format *f);
|
||||||
int cx8800_start_vbi_dma(struct cx8800_dev *dev,
|
|
||||||
struct cx88_dmaqueue *q,
|
|
||||||
struct cx88_buffer *buf);
|
|
||||||
int cx8800_stop_vbi_dma(struct cx8800_dev *dev);
|
int cx8800_stop_vbi_dma(struct cx8800_dev *dev);
|
||||||
int cx8800_restart_vbi_queue(struct cx8800_dev *dev,
|
int cx8800_restart_vbi_queue(struct cx8800_dev *dev,
|
||||||
struct cx88_dmaqueue *q);
|
struct cx88_dmaqueue *q);
|
||||||
|
|
|
@ -172,7 +172,7 @@ static int fe_request_firmware(struct dvb_frontend* fe,
|
||||||
return request_firmware(fw, name, &dev->pci->dev);
|
return request_firmware(fw, name, &dev->pci->dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct tda1004x_config medion_cardbus = {
|
static struct tda1004x_config medion_cardbus = {
|
||||||
.demod_address = 0x08, /* not sure this is correct */
|
.demod_address = 0x08, /* not sure this is correct */
|
||||||
.invert = 0,
|
.invert = 0,
|
||||||
.invert_oclk = 0,
|
.invert_oclk = 0,
|
||||||
|
|
|
@ -137,7 +137,7 @@ static unsigned short pas16_addr = 0;
|
||||||
static int pas16_irq = 0;
|
static int pas16_irq = 0;
|
||||||
|
|
||||||
|
|
||||||
int scsi_irq_translate[] =
|
static const int scsi_irq_translate[] =
|
||||||
{ 0, 0, 1, 2, 3, 4, 5, 6, 0, 0, 7, 8, 9, 0, 10, 11 };
|
{ 0, 0, 1, 2, 3, 4, 5, 6, 0, 0, 7, 8, 9, 0, 10, 11 };
|
||||||
|
|
||||||
/* The default_irqs array contains values used to set the irq into the
|
/* The default_irqs array contains values used to set the irq into the
|
||||||
|
@ -145,7 +145,7 @@ int scsi_irq_translate[] =
|
||||||
* irq jumpers on the board). The first value in the array will be
|
* irq jumpers on the board). The first value in the array will be
|
||||||
* assigned to logical board 0, the next to board 1, etc.
|
* assigned to logical board 0, the next to board 1, etc.
|
||||||
*/
|
*/
|
||||||
int default_irqs[] __initdata =
|
static int default_irqs[] __initdata =
|
||||||
{ PAS16_DEFAULT_BOARD_1_IRQ,
|
{ PAS16_DEFAULT_BOARD_1_IRQ,
|
||||||
PAS16_DEFAULT_BOARD_2_IRQ,
|
PAS16_DEFAULT_BOARD_2_IRQ,
|
||||||
PAS16_DEFAULT_BOARD_3_IRQ,
|
PAS16_DEFAULT_BOARD_3_IRQ,
|
||||||
|
@ -177,7 +177,7 @@ static struct base {
|
||||||
|
|
||||||
#define NO_BASES (sizeof (bases) / sizeof (struct base))
|
#define NO_BASES (sizeof (bases) / sizeof (struct base))
|
||||||
|
|
||||||
unsigned short pas16_offset[ 8 ] =
|
static const unsigned short pas16_offset[ 8 ] =
|
||||||
{
|
{
|
||||||
0x1c00, /* OUTPUT_DATA_REG */
|
0x1c00, /* OUTPUT_DATA_REG */
|
||||||
0x1c01, /* INITIATOR_COMMAND_REG */
|
0x1c01, /* INITIATOR_COMMAND_REG */
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
* share_irqs - whether we pass SA_SHIRQ to request_irq(). This option
|
* share_irqs - whether we pass SA_SHIRQ to request_irq(). This option
|
||||||
* is unsafe when used on edge-triggered interrupts.
|
* is unsafe when used on edge-triggered interrupts.
|
||||||
*/
|
*/
|
||||||
unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
|
static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Debugging.
|
* Debugging.
|
||||||
|
|
|
@ -393,7 +393,6 @@ int jsm_tty_init(struct jsm_board *);
|
||||||
int jsm_uart_port_init(struct jsm_board *);
|
int jsm_uart_port_init(struct jsm_board *);
|
||||||
int jsm_remove_uart_port(struct jsm_board *);
|
int jsm_remove_uart_port(struct jsm_board *);
|
||||||
void jsm_input(struct jsm_channel *ch);
|
void jsm_input(struct jsm_channel *ch);
|
||||||
void jsm_carrier(struct jsm_channel *ch);
|
|
||||||
void jsm_check_queue_flow_control(struct jsm_channel *ch);
|
void jsm_check_queue_flow_control(struct jsm_channel *ch);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -688,7 +688,7 @@ static void neo_flush_uart_read(struct jsm_channel *ch)
|
||||||
/*
|
/*
|
||||||
* No locks are assumed to be held when calling this function.
|
* No locks are assumed to be held when calling this function.
|
||||||
*/
|
*/
|
||||||
void neo_clear_break(struct jsm_channel *ch, int force)
|
static void neo_clear_break(struct jsm_channel *ch, int force)
|
||||||
{
|
{
|
||||||
unsigned long lock_flags;
|
unsigned long lock_flags;
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
|
|
||||||
#include "jsm.h"
|
#include "jsm.h"
|
||||||
|
|
||||||
|
static void jsm_carrier(struct jsm_channel *ch);
|
||||||
|
|
||||||
static inline int jsm_get_mstat(struct jsm_channel *ch)
|
static inline int jsm_get_mstat(struct jsm_channel *ch)
|
||||||
{
|
{
|
||||||
unsigned char mstat;
|
unsigned char mstat;
|
||||||
|
@ -755,7 +757,7 @@ void jsm_input(struct jsm_channel *ch)
|
||||||
jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
|
jsm_printk(IOCTL, INFO, &ch->ch_bd->pci_dev, "finish\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void jsm_carrier(struct jsm_channel *ch)
|
static void jsm_carrier(struct jsm_channel *ch)
|
||||||
{
|
{
|
||||||
struct jsm_board *bd;
|
struct jsm_board *bd;
|
||||||
|
|
||||||
|
|
|
@ -1012,7 +1012,6 @@ extern int copy_thread(int, unsigned long, unsigned long, unsigned long, struct
|
||||||
extern void flush_thread(void);
|
extern void flush_thread(void);
|
||||||
extern void exit_thread(void);
|
extern void exit_thread(void);
|
||||||
|
|
||||||
extern void exit_mm(struct task_struct *);
|
|
||||||
extern void exit_files(struct task_struct *);
|
extern void exit_files(struct task_struct *);
|
||||||
extern void exit_signal(struct task_struct *);
|
extern void exit_signal(struct task_struct *);
|
||||||
extern void __exit_signal(struct task_struct *);
|
extern void __exit_signal(struct task_struct *);
|
||||||
|
|
|
@ -39,6 +39,8 @@ extern struct task_struct *child_reaper;
|
||||||
|
|
||||||
int getrusage(struct task_struct *, int, struct rusage __user *);
|
int getrusage(struct task_struct *, int, struct rusage __user *);
|
||||||
|
|
||||||
|
static void exit_mm(struct task_struct * tsk);
|
||||||
|
|
||||||
static void __unhash_process(struct task_struct *p)
|
static void __unhash_process(struct task_struct *p)
|
||||||
{
|
{
|
||||||
nr_threads--;
|
nr_threads--;
|
||||||
|
@ -474,7 +476,7 @@ EXPORT_SYMBOL_GPL(exit_fs);
|
||||||
* Turn us into a lazy TLB process if we
|
* Turn us into a lazy TLB process if we
|
||||||
* aren't already..
|
* aren't already..
|
||||||
*/
|
*/
|
||||||
void exit_mm(struct task_struct * tsk)
|
static void exit_mm(struct task_struct * tsk)
|
||||||
{
|
{
|
||||||
struct mm_struct *mm = tsk->mm;
|
struct mm_struct *mm = tsk->mm;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue