From d3693e2f13142d8c91bd43fefa34903fb88ded1c Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Fri, 26 Mar 1999 23:54:56 +0000 Subject: [PATCH] add 'static' to get rid of offending results of 'nm --extern --defined'. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@344 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/busses/i2c-via.c | 6 +++--- kernel/chips/gl518sm.c | 4 ++-- kernel/chips/icspll.c | 2 +- kernel/chips/w83781d.c | 18 +++++++++++------- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/kernel/busses/i2c-via.c b/kernel/busses/i2c-via.c index 1deacace..7f30fc02 100644 --- a/kernel/busses/i2c-via.c +++ b/kernel/busses/i2c-via.c @@ -63,7 +63,7 @@ /* ----- local functions ---------------------------------------------- */ -u16 pm_io_base; +static u16 pm_io_base; static void bit_via_setscl(void *data, int state) { @@ -100,7 +100,7 @@ static int bit_via_unreg(struct i2c_client *client) /* ------------------------------------------------------------------------ */ -struct bit_adapter bit_via_ops = { +static struct bit_adapter bit_via_ops = { "VIA i2c", HW_B_VIA, NULL, @@ -199,7 +199,7 @@ static int find_via(void) } #endif -int init_i2c_via(void) +static int init_i2c_via(void) { if (find_via() < 0) { printk("Error while reading PCI configuration\n"); diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c index b7fe84dc..9246e3ed 100644 --- a/kernel/chips/gl518sm.c +++ b/kernel/chips/gl518sm.c @@ -155,7 +155,7 @@ struct gl518_data { /* load time parameter that says if we want to spend 10 seconds for reading all voltages from a GL518 rev 0, or if we want to read zeros */ -int readall = 0; +static int readall = 0; #ifdef MODULE extern int init_module(void); @@ -175,6 +175,7 @@ static u16 swap_bytes(u16 val); static int gl518_read_value(struct i2c_client *client, u8 reg); static int gl518_write_value(struct i2c_client *client, u8 reg, u16 value); static void gl518_update_client(struct i2c_client *client); +static void gl518_update_client_rev00(struct i2c_client *client); static void gl518_vin(struct i2c_client *client, int operation, int ctl_name, int *nrels_mag, long *results); @@ -512,7 +513,6 @@ void gl518_update_client(struct i2c_client *client) void gl518_update_client_rev00(struct i2c_client *client) { struct gl518_data *data = client->data; - struct wait_queue *wait = NULL; int j, min, max[3], delta; down(&data->update_lock); diff --git a/kernel/chips/icspll.c b/kernel/chips/icspll.c index 6cedee24..8860922c 100644 --- a/kernel/chips/icspll.c +++ b/kernel/chips/icspll.c @@ -102,7 +102,7 @@ static ctl_table icspll_dir_table_template[] = { }; /* holding place for data - block read could be as much as 32 */ -u8 tempdata[MAXBLOCK_SIZE]; +static u8 tempdata[MAXBLOCK_SIZE]; /* Used by init/cleanup */ static int icspll_initialized = 0; diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index 29bc1de3..f18139ca 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -68,9 +68,12 @@ SENSORS_INSMOD_3(w83781d,w83782d,w83783s); /* The W83781D registers */ /* The W83782D registers for nr=7,8 are in bank 5 */ -#define W83781D_REG_IN_MAX(nr) ((nr < 7) ? (0x2b + (nr) * 2) : (0x554 + (((nr) - 7) * 2))) -#define W83781D_REG_IN_MIN(nr) ((nr < 7) ? (0x2c + (nr) * 2) : (0x555 + (((nr) - 7) * 2))) -#define W83781D_REG_IN(nr) ((nr < 7) ? (0x20 + (nr)) : (0x550 + (nr) - 7)) +#define W83781D_REG_IN_MAX(nr) ((nr < 7) ? (0x2b + (nr) * 2) : \ + (0x554 + (((nr) - 7) * 2))) +#define W83781D_REG_IN_MIN(nr) ((nr < 7) ? (0x2c + (nr) * 2) : \ + (0x555 + (((nr) - 7) * 2))) +#define W83781D_REG_IN(nr) ((nr < 7) ? (0x20 + (nr)) : \ + (0x550 + (nr) - 7)) #define W83781D_REG_FAN_MIN(nr) (0x3a + (nr)) #define W83781D_REG_FAN(nr) (0x27 + (nr)) @@ -108,8 +111,9 @@ SENSORS_INSMOD_3(w83781d,w83782d,w83783s); #define W83781D_REG_PIN 0x4B /* PWM 782D (1-4) and 783S (1-2) only */ -#define W83781D_REG_PWM1 0x5B /* 782d and 783s datasheets disagree on which is which. */ -#define W83781D_REG_PWM2 0x5A /* We follow 782d datasheet convention here */ +#define W83781D_REG_PWM1 0x5B /* 782d and 783s datasheets disagree + on which is which. */ +#define W83781D_REG_PWM2 0x5A /* We follow 782d datasheet convention here */ #define W83781D_REG_PWM3 0x5E #define W83781D_REG_PWM4 0x5F #define W83781D_REG_PWMCLK12 0x5C @@ -124,9 +128,9 @@ static const u8 regpwm[] = {W83781D_REG_PWM1, W83781D_REG_PWM2, received the information in an email from Winbond tech support */ /* Sensor selection 782D/783S only */ #define W83781D_REG_SCFG1 0x5D -const u8 BIT_SCFG1[] = {0x02, 0x04, 0x08}; +static const u8 BIT_SCFG1[] = {0x02, 0x04, 0x08}; #define W83781D_REG_SCFG2 0x59 -const u8 BIT_SCFG2[] = {0x10, 0x04, 0x08}; +static const u8 BIT_SCFG2[] = {0x10, 0x04, 0x08}; #define W83781D_DEFAULT_BETA 3435 /* RT Table registers */