mirror of https://gitee.com/openkylin/linux.git
i2c: Constify i2c_algorithm declarations, part 2
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@linux-fr.org> Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
9e11a9fbfe
commit
8f9082c5ce
|
@ -293,7 +293,7 @@ static u32 acpi_ec_smb_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -468,7 +468,7 @@ static u32 ali1535_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -367,7 +367,7 @@ static void ali1563_shutdown(struct pci_dev *dev)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -463,7 +463,7 @@ static u32 ali15x3_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -294,7 +294,7 @@ static u32 amd756_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -316,7 +316,7 @@ static u32 amd8111_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -287,7 +287,7 @@ au1550_func(struct i2c_adapter *adap)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -434,7 +434,7 @@ static u32 i801_func(struct i2c_adapter *adapter)
|
|||
| (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,
|
||||
};
|
||||
|
|
|
@ -625,7 +625,7 @@ static u32 iic_func(struct i2c_adapter *adap)
|
|||
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
|
||||
};
|
||||
|
|
|
@ -401,7 +401,7 @@ iop3xx_i2c_func(struct i2c_adapter *adap)
|
|||
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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -272,7 +272,7 @@ static u32 mpc_functionality(struct i2c_adapter *adap)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -431,7 +431,7 @@ mv64xxx_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -109,7 +109,7 @@ static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -199,7 +199,7 @@ static u32 ocores_func(struct i2c_adapter *adap)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -526,7 +526,7 @@ omap_i2c_isr(int this_irq, void *dev_id, struct pt_regs *regs)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -376,7 +376,7 @@ static u32 piix4_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -175,7 +175,7 @@ static u32 i2c_powermac_func(struct i2c_adapter * adapter)
|
|||
}
|
||||
|
||||
/* 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,
|
||||
|
|
|
@ -926,7 +926,7 @@ static u32 i2c_pxa_functionality(struct i2c_adapter *adap)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -566,7 +566,7 @@ static u32 s3c24xx_i2c_func(struct i2c_adapter *adap)
|
|||
|
||||
/* 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,
|
||||
};
|
||||
|
|
|
@ -132,7 +132,7 @@ static u32 bit_func(struct i2c_adapter *adap)
|
|||
|
||||
/* -----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,
|
||||
};
|
||||
|
|
|
@ -358,7 +358,7 @@ static u32 sis5595_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -450,7 +450,7 @@ static int sis630_setup(struct pci_dev *sis630_dev)
|
|||
}
|
||||
|
||||
|
||||
static struct i2c_algorithm smbus_algorithm = {
|
||||
static const struct i2c_algorithm smbus_algorithm = {
|
||||
.smbus_xfer = sis630_access,
|
||||
.functionality = sis630_func,
|
||||
};
|
||||
|
|
|
@ -242,7 +242,7 @@ static u32 sis96x_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -115,7 +115,7 @@ static u32 stub_func(struct i2c_adapter *adapter)
|
|||
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,
|
||||
};
|
||||
|
|
|
@ -299,7 +299,7 @@ static u32 vt596_func(struct i2c_adapter *adapter)
|
|||
return func;
|
||||
}
|
||||
|
||||
static struct i2c_algorithm smbus_algorithm = {
|
||||
static const struct i2c_algorithm smbus_algorithm = {
|
||||
.smbus_xfer = vt596_access,
|
||||
.functionality = vt596_func,
|
||||
};
|
||||
|
|
|
@ -383,7 +383,7 @@ static u32 scx200_acb_func(struct i2c_adapter *adapter)
|
|||
}
|
||||
|
||||
/* 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,
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue