diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-09-25 10:23:07 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 17:02:06 -0400 |
commit | 605070952f0b41caaa211c47b02eeac703529008 (patch) | |
tree | 2fd15a6609ed602877164eec399fcae0919f64ea | |
parent | b918ecd2429e1a89b846d9e49ca4520b963c13e8 (diff) |
[PATCH] i2c: Discard explicit static initializations to 0
Kill explicit static initializations to 0 in 10 i2c drivers.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/i2c/algos/i2c-algo-pca.c | 2 +-
drivers/i2c/algos/i2c-algo-sibyte.c | 2 +-
drivers/i2c/busses/i2c-ali15x3.c | 4 ++--
drivers/i2c/busses/i2c-amd756.c | 2 +-
drivers/i2c/busses/i2c-iop3xx.c | 2 +-
drivers/i2c/busses/i2c-piix4.c | 8 ++++----
drivers/i2c/busses/i2c-sis5595.c | 4 ++--
drivers/i2c/busses/i2c-sis630.c | 2 +-
drivers/i2c/busses/i2c-sis96x.c | 2 +-
drivers/i2c/busses/i2c-via.c | 2 +-
10 files changed, 15 insertions(+), 15 deletions(-)
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pca.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sibyte.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ali15x3.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-amd756.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-iop3xx.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-piix4.c | 8 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-sis5595.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-sis630.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-sis96x.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-via.c | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index beb10edfe9c1..82946acab4c7 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #define DEB2(fmt, args...) do { if (i2c_debug>=2) printk(fmt, ## args); } while(0) | 34 | #define DEB2(fmt, args...) do { if (i2c_debug>=2) printk(fmt, ## args); } while(0) |
35 | #define DEB3(fmt, args...) do { if (i2c_debug>=3) printk(fmt, ## args); } while(0) | 35 | #define DEB3(fmt, args...) do { if (i2c_debug>=3) printk(fmt, ## args); } while(0) |
36 | 36 | ||
37 | static int i2c_debug=0; | 37 | static int i2c_debug; |
38 | 38 | ||
39 | #define pca_outw(adap, reg, val) adap->write_byte(adap, reg, val) | 39 | #define pca_outw(adap, reg, val) adap->write_byte(adap, reg, val) |
40 | #define pca_inw(adap, reg) adap->read_byte(adap, reg) | 40 | #define pca_inw(adap, reg) adap->read_byte(adap, reg) |
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c index 8ed5ad12552f..938848ae162d 100644 --- a/drivers/i2c/algos/i2c-algo-sibyte.c +++ b/drivers/i2c/algos/i2c-algo-sibyte.c | |||
@@ -42,7 +42,7 @@ | |||
42 | 42 | ||
43 | /* module parameters: | 43 | /* module parameters: |
44 | */ | 44 | */ |
45 | static int bit_scan=0; /* have a look at what's hanging 'round */ | 45 | static int bit_scan; /* have a look at what's hanging 'round */ |
46 | 46 | ||
47 | 47 | ||
48 | static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr, | 48 | static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr, |
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c index b3f50bff39a0..e13d60c120b9 100644 --- a/drivers/i2c/busses/i2c-ali15x3.c +++ b/drivers/i2c/busses/i2c-ali15x3.c | |||
@@ -125,12 +125,12 @@ | |||
125 | 125 | ||
126 | /* If force_addr is set to anything different from 0, we forcibly enable | 126 | /* If force_addr is set to anything different from 0, we forcibly enable |
127 | the device at the given address. */ | 127 | the device at the given address. */ |
128 | static u16 force_addr = 0; | 128 | static u16 force_addr; |
129 | module_param(force_addr, ushort, 0); | 129 | module_param(force_addr, ushort, 0); |
130 | MODULE_PARM_DESC(force_addr, | 130 | MODULE_PARM_DESC(force_addr, |
131 | "Initialize the base address of the i2c controller"); | 131 | "Initialize the base address of the i2c controller"); |
132 | 132 | ||
133 | static unsigned short ali15x3_smba = 0; | 133 | static unsigned short ali15x3_smba; |
134 | 134 | ||
135 | static int ali15x3_setup(struct pci_dev *ALI15X3_dev) | 135 | static int ali15x3_setup(struct pci_dev *ALI15X3_dev) |
136 | { | 136 | { |
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 6ad0603384b8..3bbac2f8ce38 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c | |||
@@ -86,7 +86,7 @@ | |||
86 | #define AMD756_BLOCK_DATA 0x05 | 86 | #define AMD756_BLOCK_DATA 0x05 |
87 | 87 | ||
88 | 88 | ||
89 | static unsigned short amd756_ioport = 0; | 89 | static unsigned short amd756_ioport; |
90 | 90 | ||
91 | /* | 91 | /* |
92 | SMBUS event = I/O 28-29 bit 11 | 92 | SMBUS event = I/O 28-29 bit 11 |
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index 7bd9102db701..745e3a51f3e5 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "i2c-iop3xx.h" | 43 | #include "i2c-iop3xx.h" |
44 | 44 | ||
45 | /* global unit counter */ | 45 | /* global unit counter */ |
46 | static int i2c_id = 0; | 46 | static int i2c_id; |
47 | 47 | ||
48 | static inline unsigned char | 48 | static inline unsigned char |
49 | iic_cook_addr(struct i2c_msg *msg) | 49 | iic_cook_addr(struct i2c_msg *msg) |
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c index 6d48a4da7bed..1b2d3ebd1075 100644 --- a/drivers/i2c/busses/i2c-piix4.c +++ b/drivers/i2c/busses/i2c-piix4.c | |||
@@ -90,13 +90,13 @@ struct sd { | |||
90 | 90 | ||
91 | /* If force is set to anything different from 0, we forcibly enable the | 91 | /* If force is set to anything different from 0, we forcibly enable the |
92 | PIIX4. DANGEROUS! */ | 92 | PIIX4. DANGEROUS! */ |
93 | static int force = 0; | 93 | static int force; |
94 | module_param (force, int, 0); | 94 | module_param (force, int, 0); |
95 | MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!"); | 95 | MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!"); |
96 | 96 | ||
97 | /* If force_addr is set to anything different from 0, we forcibly enable | 97 | /* If force_addr is set to anything different from 0, we forcibly enable |
98 | the PIIX4 at the given address. VERY DANGEROUS! */ | 98 | the PIIX4 at the given address. VERY DANGEROUS! */ |
99 | static int force_addr = 0; | 99 | static int force_addr; |
100 | module_param (force_addr, int, 0); | 100 | module_param (force_addr, int, 0); |
101 | MODULE_PARM_DESC(force_addr, | 101 | MODULE_PARM_DESC(force_addr, |
102 | "Forcibly enable the PIIX4 at the given address. " | 102 | "Forcibly enable the PIIX4 at the given address. " |
@@ -104,14 +104,14 @@ MODULE_PARM_DESC(force_addr, | |||
104 | 104 | ||
105 | /* If fix_hstcfg is set to anything different from 0, we reset one of the | 105 | /* If fix_hstcfg is set to anything different from 0, we reset one of the |
106 | registers to be a valid value. */ | 106 | registers to be a valid value. */ |
107 | static int fix_hstcfg = 0; | 107 | static int fix_hstcfg; |
108 | module_param (fix_hstcfg, int, 0); | 108 | module_param (fix_hstcfg, int, 0); |
109 | MODULE_PARM_DESC(fix_hstcfg, | 109 | MODULE_PARM_DESC(fix_hstcfg, |
110 | "Fix config register. Needed on some boards (Force CPCI735)."); | 110 | "Fix config register. Needed on some boards (Force CPCI735)."); |
111 | 111 | ||
112 | static int piix4_transaction(void); | 112 | static int piix4_transaction(void); |
113 | 113 | ||
114 | static unsigned short piix4_smba = 0; | 114 | static unsigned short piix4_smba; |
115 | static struct i2c_adapter piix4_adapter; | 115 | static struct i2c_adapter piix4_adapter; |
116 | 116 | ||
117 | static struct dmi_system_id __devinitdata piix4_dmi_table[] = { | 117 | static struct dmi_system_id __devinitdata piix4_dmi_table[] = { |
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c index 080318d6f54b..3fd38f4673e3 100644 --- a/drivers/i2c/busses/i2c-sis5595.c +++ b/drivers/i2c/busses/i2c-sis5595.c | |||
@@ -123,11 +123,11 @@ static int blacklist[] = { | |||
123 | 123 | ||
124 | /* If force_addr is set to anything different from 0, we forcibly enable | 124 | /* If force_addr is set to anything different from 0, we forcibly enable |
125 | the device at the given address. */ | 125 | the device at the given address. */ |
126 | static u16 force_addr = 0; | 126 | static u16 force_addr; |
127 | module_param(force_addr, ushort, 0); | 127 | module_param(force_addr, ushort, 0); |
128 | MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller"); | 128 | MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller"); |
129 | 129 | ||
130 | static unsigned short sis5595_base = 0; | 130 | static unsigned short sis5595_base; |
131 | 131 | ||
132 | static u8 sis5595_read(u8 reg) | 132 | static u8 sis5595_read(u8 reg) |
133 | { | 133 | { |
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c index 86f0f448fa0b..44c4e68e9a98 100644 --- a/drivers/i2c/busses/i2c-sis630.c +++ b/drivers/i2c/busses/i2c-sis630.c | |||
@@ -101,7 +101,7 @@ module_param(force, bool, 0); | |||
101 | MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!"); | 101 | MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!"); |
102 | 102 | ||
103 | /* acpi base address */ | 103 | /* acpi base address */ |
104 | static unsigned short acpi_base = 0; | 104 | static unsigned short acpi_base; |
105 | 105 | ||
106 | /* supported chips */ | 106 | /* supported chips */ |
107 | static int supported[] = { | 107 | static int supported[] = { |
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index ead2ff3cf60e..9ddd910c3b99 100644 --- a/drivers/i2c/busses/i2c-sis96x.c +++ b/drivers/i2c/busses/i2c-sis96x.c | |||
@@ -83,7 +83,7 @@ | |||
83 | #define SIS96x_BLOCK_DATA 0x05 | 83 | #define SIS96x_BLOCK_DATA 0x05 |
84 | 84 | ||
85 | static struct i2c_adapter sis96x_adapter; | 85 | static struct i2c_adapter sis96x_adapter; |
86 | static u16 sis96x_smbus_base = 0; | 86 | static u16 sis96x_smbus_base; |
87 | 87 | ||
88 | static inline u8 sis96x_read(u8 reg) | 88 | static inline u8 sis96x_read(u8 reg) |
89 | { | 89 | { |
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c index 040b8abeabba..0b3edd4e6c12 100644 --- a/drivers/i2c/busses/i2c-via.c +++ b/drivers/i2c/busses/i2c-via.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #define IOSPACE 0x06 | 45 | #define IOSPACE 0x06 |
46 | #define IOTEXT "via-i2c" | 46 | #define IOTEXT "via-i2c" |
47 | 47 | ||
48 | static u16 pm_io_base = 0; | 48 | static u16 pm_io_base; |
49 | 49 | ||
50 | /* | 50 | /* |
51 | It does not appear from the datasheet that the GPIO pins are | 51 | It does not appear from the datasheet that the GPIO pins are |