Kill explicit static initializations to 0 in 10 i2c drivers.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
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(-)
--- linux-2.6.14-rc2.orig/drivers/i2c/algos/i2c-algo-pca.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/algos/i2c-algo-pca.c 2005-09-25 14:32:07.000000000 +0200
@@ -34,7 +34,7 @@
#define DEB2(fmt, args...) do { if (i2c_debug>=2) printk(fmt, ## args); } while(0)
#define DEB3(fmt, args...) do { if (i2c_debug>=3) printk(fmt, ## args); } while(0)
-static int i2c_debug=0;
+static int i2c_debug;
#define pca_outw(adap, reg, val) adap->write_byte(adap, reg, val)
#define pca_inw(adap, reg) adap->read_byte(adap, reg)
--- linux-2.6.14-rc2.orig/drivers/i2c/algos/i2c-algo-sibyte.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/algos/i2c-algo-sibyte.c 2005-09-25 14:32:07.000000000 +0200
@@ -42,7 +42,7 @@
/* module parameters:
*/
-static int bit_scan=0; /* have a look at what's hanging 'round */
+static int bit_scan; /* have a look at what's hanging 'round */
static int smbus_xfer(struct i2c_adapter *i2c_adap, u16 addr,
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-ali15x3.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-ali15x3.c 2005-09-25 14:32:07.000000000 +0200
@@ -125,12 +125,12 @@
/* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */
-static u16 force_addr = 0;
+static u16 force_addr;
module_param(force_addr, ushort, 0);
MODULE_PARM_DESC(force_addr,
"Initialize the base address of the i2c controller");
-static unsigned short ali15x3_smba = 0;
+static unsigned short ali15x3_smba;
static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
{
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-amd756.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-amd756.c 2005-09-25 14:32:07.000000000 +0200
@@ -86,7 +86,7 @@
#define AMD756_BLOCK_DATA 0x05
-static unsigned short amd756_ioport = 0;
+static unsigned short amd756_ioport;
/*
SMBUS event = I/O 28-29 bit 11
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-iop3xx.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-iop3xx.c 2005-09-25 14:32:07.000000000 +0200
@@ -43,7 +43,7 @@
#include "i2c-iop3xx.h"
/* global unit counter */
-static int i2c_id = 0;
+static int i2c_id;
static inline unsigned char
iic_cook_addr(struct i2c_msg *msg)
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-piix4.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-piix4.c 2005-09-25 14:32:07.000000000 +0200
@@ -90,13 +90,13 @@
/* If force is set to anything different from 0, we forcibly enable the
PIIX4. DANGEROUS! */
-static int force = 0;
+static int force;
module_param (force, int, 0);
MODULE_PARM_DESC(force, "Forcibly enable the PIIX4. DANGEROUS!");
/* If force_addr is set to anything different from 0, we forcibly enable
the PIIX4 at the given address. VERY DANGEROUS! */
-static int force_addr = 0;
+static int force_addr;
module_param (force_addr, int, 0);
MODULE_PARM_DESC(force_addr,
"Forcibly enable the PIIX4 at the given address. "
@@ -104,14 +104,14 @@
/* If fix_hstcfg is set to anything different from 0, we reset one of the
registers to be a valid value. */
-static int fix_hstcfg = 0;
+static int fix_hstcfg;
module_param (fix_hstcfg, int, 0);
MODULE_PARM_DESC(fix_hstcfg,
"Fix config register. Needed on some boards (Force CPCI735).");
static int piix4_transaction(void);
-static unsigned short piix4_smba = 0;
+static unsigned short piix4_smba;
static struct i2c_adapter piix4_adapter;
static struct dmi_system_id __devinitdata piix4_dmi_table[] = {
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-sis5595.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-sis5595.c 2005-09-25 14:32:07.000000000 +0200
@@ -123,11 +123,11 @@
/* If force_addr is set to anything different from 0, we forcibly enable
the device at the given address. */
-static u16 force_addr = 0;
+static u16 force_addr;
module_param(force_addr, ushort, 0);
MODULE_PARM_DESC(force_addr, "Initialize the base address of the i2c controller");
-static unsigned short sis5595_base = 0;
+static unsigned short sis5595_base;
static u8 sis5595_read(u8 reg)
{
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-sis630.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-sis630.c 2005-09-25 14:32:07.000000000 +0200
@@ -101,7 +101,7 @@
MODULE_PARM_DESC(force, "Forcibly enable the SIS630. DANGEROUS!");
/* acpi base address */
-static unsigned short acpi_base = 0;
+static unsigned short acpi_base;
/* supported chips */
static int supported[] = {
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-sis96x.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-sis96x.c 2005-09-25 14:32:07.000000000 +0200
@@ -83,7 +83,7 @@
#define SIS96x_BLOCK_DATA 0x05
static struct i2c_adapter sis96x_adapter;
-static u16 sis96x_smbus_base = 0;
+static u16 sis96x_smbus_base;
static inline u8 sis96x_read(u8 reg)
{
--- linux-2.6.14-rc2.orig/drivers/i2c/busses/i2c-via.c 2005-09-25 14:29:35.000000000 +0200
+++ linux-2.6.14-rc2/drivers/i2c/busses/i2c-via.c 2005-09-25 14:32:07.000000000 +0200
@@ -45,7 +45,7 @@
#define IOSPACE 0x06
#define IOTEXT "via-i2c"
-static u16 pm_io_base = 0;
+static u16 pm_io_base;
/*
It does not appear from the datasheet that the GPIO pins are
--
Jean Delvare
