[i2c] [PATCH 12/13] i2c: Constify i2c_algorithm declarations, part 2
Jean Delvare
khali at linux-fr.org
Sun Sep 3 22:39:46 CEST 2006
Content-Disposition: inline; filename=i2c-busses-constify-i2c_algorithm.patch
i2c: Constify i2c_algorithm declarations, part 2
Make struct i2c_algorithm declarations const in all i2c bus drivers
where it is possible.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Cc: David Brownell <david-b at pacbell.net>
---
drivers/acpi/i2c_ec.c | 2 +-
drivers/i2c/busses/i2c-ali1535.c | 2 +-
drivers/i2c/busses/i2c-ali1563.c | 2 +-
drivers/i2c/busses/i2c-ali15x3.c | 2 +-
drivers/i2c/busses/i2c-amd756.c | 2 +-
drivers/i2c/busses/i2c-amd8111.c | 2 +-
drivers/i2c/busses/i2c-au1550.c | 2 +-
drivers/i2c/busses/i2c-i801.c | 2 +-
drivers/i2c/busses/i2c-ibm_iic.c | 2 +-
drivers/i2c/busses/i2c-iop3xx.c | 2 +-
drivers/i2c/busses/i2c-isa.c | 2 +-
drivers/i2c/busses/i2c-mpc.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
drivers/i2c/busses/i2c-nforce2.c | 2 +-
drivers/i2c/busses/i2c-ocores.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 2 +-
drivers/i2c/busses/i2c-piix4.c | 2 +-
drivers/i2c/busses/i2c-powermac.c | 2 +-
drivers/i2c/busses/i2c-pxa.c | 2 +-
drivers/i2c/busses/i2c-s3c2410.c | 2 +-
drivers/i2c/busses/i2c-sibyte.c | 2 +-
drivers/i2c/busses/i2c-sis5595.c | 2 +-
drivers/i2c/busses/i2c-sis630.c | 2 +-
drivers/i2c/busses/i2c-sis96x.c | 2 +-
drivers/i2c/busses/i2c-stub.c | 2 +-
drivers/i2c/busses/i2c-viapro.c | 2 +-
drivers/i2c/busses/scx200_acb.c | 2 +-
27 files changed, 27 insertions(+), 27 deletions(-)
--- linux-2.6.18-rc5.orig/drivers/acpi/i2c_ec.c 2006-08-28 09:19:17.000000000 +0200
+++ linux-2.6.18-rc5/drivers/acpi/i2c_ec.c 2006-09-03 18:02:51.000000000 +0200
@@ -293,7 +293,7 @@
I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_HWPEC_CALC);
}
-static struct i2c_algorithm acpi_ec_smbus_algorithm = {
+static const struct i2c_algorithm acpi_ec_smbus_algorithm = {
.smbus_xfer = acpi_ec_smb_access,
.functionality = acpi_ec_smb_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-ali1535.c 2006-06-18 15:57:43.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-ali1535.c 2006-09-03 17:53:23.000000000 +0200
@@ -468,7 +468,7 @@
I2C_FUNC_SMBUS_BLOCK_DATA;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = ali1535_access,
.functionality = ali1535_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-ali1563.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-ali1563.c 2006-09-03 17:53:22.000000000 +0200
@@ -367,7 +367,7 @@
release_region(ali1563_smba,ALI1563_SMB_IOSIZE);
}
-static struct i2c_algorithm ali1563_algorithm = {
+static const struct i2c_algorithm ali1563_algorithm = {
.smbus_xfer = ali1563_access,
.functionality = ali1563_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-ali15x3.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-ali15x3.c 2006-09-03 17:53:22.000000000 +0200
@@ -463,7 +463,7 @@
I2C_FUNC_SMBUS_BLOCK_DATA;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = ali15x3_access,
.functionality = ali15x3_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-amd756.c 2006-08-06 12:21:14.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-amd756.c 2006-09-03 17:53:15.000000000 +0200
@@ -294,7 +294,7 @@
I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_PROC_CALL;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = amd756_access,
.functionality = amd756_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-amd8111.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-amd8111.c 2006-09-03 17:53:14.000000000 +0200
@@ -316,7 +316,7 @@
I2C_FUNC_SMBUS_I2C_BLOCK | I2C_FUNC_SMBUS_HWPEC_CALC;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = amd8111_access,
.functionality = amd8111_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-au1550.c 2006-09-02 09:57:25.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-au1550.c 2006-09-03 17:53:13.000000000 +0200
@@ -287,7 +287,7 @@
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
-static struct i2c_algorithm au1550_algo = {
+static const struct i2c_algorithm au1550_algo = {
.master_xfer = au1550_xfer,
.functionality = au1550_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-i801.c 2006-09-02 09:58:47.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-i801.c 2006-09-03 17:53:13.000000000 +0200
@@ -434,7 +434,7 @@
| (isich4 ? I2C_FUNC_SMBUS_HWPEC_CALC : 0);
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = i801_access,
.functionality = i801_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-ibm_iic.c 2006-07-26 23:04:11.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-ibm_iic.c 2006-09-03 17:53:12.000000000 +0200
@@ -625,7 +625,7 @@
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR;
}
-static struct i2c_algorithm iic_algo = {
+static const struct i2c_algorithm iic_algo = {
.master_xfer = iic_xfer,
.functionality = iic_func
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-iop3xx.c 2006-07-26 23:08:37.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-iop3xx.c 2006-09-03 17:53:11.000000000 +0200
@@ -401,7 +401,7 @@
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
-static struct i2c_algorithm iop3xx_i2c_algo = {
+static const struct i2c_algorithm iop3xx_i2c_algo = {
.master_xfer = iop3xx_i2c_master_xfer,
.algo_control = iop3xx_i2c_algo_control,
.functionality = iop3xx_i2c_func,
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-isa.c 2006-09-02 09:57:52.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-isa.c 2006-09-03 17:53:11.000000000 +0200
@@ -43,7 +43,7 @@
static u32 isa_func(struct i2c_adapter *adapter);
/* This is the actual algorithm we define */
-static struct i2c_algorithm isa_algorithm = {
+static const struct i2c_algorithm isa_algorithm = {
.functionality = isa_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-mpc.c 2006-07-26 23:04:11.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-mpc.c 2006-09-03 17:53:10.000000000 +0200
@@ -272,7 +272,7 @@
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
-static struct i2c_algorithm mpc_algo = {
+static const struct i2c_algorithm mpc_algo = {
.master_xfer = mpc_xfer,
.functionality = mpc_functionality,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-mv64xxx.c 2006-06-18 15:57:43.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-mv64xxx.c 2006-09-03 17:53:09.000000000 +0200
@@ -431,7 +431,7 @@
return num;
}
-static struct i2c_algorithm mv64xxx_i2c_algo = {
+static const struct i2c_algorithm mv64xxx_i2c_algo = {
.master_xfer = mv64xxx_i2c_xfer,
.functionality = mv64xxx_i2c_functionality,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-nforce2.c 2006-09-03 15:25:03.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-nforce2.c 2006-09-03 17:53:09.000000000 +0200
@@ -109,7 +109,7 @@
static u32 nforce2_func(struct i2c_adapter *adapter);
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = nforce2_access,
.functionality = nforce2_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-ocores.c 2006-07-26 23:04:11.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-ocores.c 2006-09-03 17:53:08.000000000 +0200
@@ -199,7 +199,7 @@
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
-static struct i2c_algorithm ocores_algorithm = {
+static const struct i2c_algorithm ocores_algorithm = {
.master_xfer = ocores_xfer,
.functionality = ocores_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-omap.c 2006-09-03 15:25:04.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-omap.c 2006-09-03 17:53:07.000000000 +0200
@@ -526,7 +526,7 @@
return count ? IRQ_HANDLED : IRQ_NONE;
}
-static struct i2c_algorithm omap_i2c_algo = {
+static const struct i2c_algorithm omap_i2c_algo = {
.master_xfer = omap_i2c_xfer,
.functionality = omap_i2c_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-piix4.c 2006-07-26 23:04:12.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-piix4.c 2006-09-03 17:53:06.000000000 +0200
@@ -376,7 +376,7 @@
I2C_FUNC_SMBUS_BLOCK_DATA;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = piix4_access,
.functionality = piix4_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-powermac.c 2006-07-26 23:08:38.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-powermac.c 2006-09-03 17:53:05.000000000 +0200
@@ -175,7 +175,7 @@
}
/* For now, we only handle smbus */
-static struct i2c_algorithm i2c_powermac_algorithm = {
+static const struct i2c_algorithm i2c_powermac_algorithm = {
.smbus_xfer = i2c_powermac_smbus_xfer,
.master_xfer = i2c_powermac_master_xfer,
.functionality = i2c_powermac_func,
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-pxa.c 2006-07-26 23:04:12.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-pxa.c 2006-09-03 17:53:05.000000000 +0200
@@ -926,7 +926,7 @@
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
}
-static struct i2c_algorithm i2c_pxa_algorithm = {
+static const struct i2c_algorithm i2c_pxa_algorithm = {
.master_xfer = i2c_pxa_xfer,
.functionality = i2c_pxa_functionality,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-s3c2410.c 2006-07-26 23:04:12.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-s3c2410.c 2006-09-03 17:53:04.000000000 +0200
@@ -566,7 +566,7 @@
/* i2c bus registration info */
-static struct i2c_algorithm s3c24xx_i2c_algorithm = {
+static const struct i2c_algorithm s3c24xx_i2c_algorithm = {
.master_xfer = s3c24xx_i2c_xfer,
.functionality = s3c24xx_i2c_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-sibyte.c 2006-09-02 09:57:24.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-sibyte.c 2006-09-03 17:53:03.000000000 +0200
@@ -132,7 +132,7 @@
/* -----exported algorithm data: ------------------------------------- */
-static struct i2c_algorithm i2c_sibyte_algo = {
+static const struct i2c_algorithm i2c_sibyte_algo = {
.smbus_xfer = smbus_xfer,
.functionality = bit_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-sis5595.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-sis5595.c 2006-09-03 17:53:03.000000000 +0200
@@ -358,7 +358,7 @@
I2C_FUNC_SMBUS_PROC_CALL;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = sis5595_access,
.functionality = sis5595_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-sis630.c 2006-01-03 04:21:10.000000000 +0100
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-sis630.c 2006-09-03 17:53:02.000000000 +0200
@@ -450,7 +450,7 @@
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = sis630_access,
.functionality = sis630_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-sis96x.c 2006-06-18 15:57:43.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-sis96x.c 2006-09-03 17:53:01.000000000 +0200
@@ -242,7 +242,7 @@
I2C_FUNC_SMBUS_PROC_CALL;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = sis96x_access,
.functionality = sis96x_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-stub.c 2006-09-02 09:57:36.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-stub.c 2006-09-03 17:53:00.000000000 +0200
@@ -115,7 +115,7 @@
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.functionality = stub_func,
.smbus_xfer = stub_xfer,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/i2c-viapro.c 2006-09-02 09:57:57.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/i2c-viapro.c 2006-09-03 17:52:59.000000000 +0200
@@ -299,7 +299,7 @@
return func;
}
-static struct i2c_algorithm smbus_algorithm = {
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = vt596_access,
.functionality = vt596_func,
};
--- linux-2.6.18-rc5.orig/drivers/i2c/busses/scx200_acb.c 2006-08-07 21:34:40.000000000 +0200
+++ linux-2.6.18-rc5/drivers/i2c/busses/scx200_acb.c 2006-09-03 17:52:57.000000000 +0200
@@ -383,7 +383,7 @@
}
/* For now, we only handle combined mode (smbus) */
-static struct i2c_algorithm scx200_acb_algorithm = {
+static const struct i2c_algorithm scx200_acb_algorithm = {
.smbus_xfer = scx200_acb_smbus_xfer,
.functionality = scx200_acb_func,
};
--
Jean Delvare
More information about the i2c
mailing list