leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: rk3x: account for const type of of_device_id.data

Browse Source 
This driver creates a number of const structures that it stores in
the data field of an of_device_id array.

The data field of an of_device_id structure has type const void *, so
there is no need for a const-discarding cast when putting const values
into such a structure.

Furthermore, adding const to the declaration of the location that
receives a const value from such a field ensures that the compiler
will continue to check that the value is not modified.  The
const-discarding cast on the extraction from the data field is thus
no longer needed.

Done using Coccinelle.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Julia Lawall 2018-01-02 14:28:03 +01:00 committed by Wolfram Sang
parent f89813ec8b
commit d032a2eb2e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/i2c/busses/i2c-rk3x.c
View File

@ -194,7 +194,7 @@ struct rk3x_i2c_soc_data {
struct rk3x_i2c { struct rk3x_i2c {
struct i2c_adapter adap; struct i2c_adapter adap;
struct device *dev; struct device *dev;
struct rk3x_i2c_soc_data *soc_data; const struct rk3x_i2c_soc_data *soc_data;
/* Hardware resources */ /* Hardware resources */
void __iomem *regs; void __iomem *regs;
@ -1164,27 +1164,27 @@ static const struct rk3x_i2c_soc_data rk3399_soc_data = {
static const struct of_device_id rk3x_i2c_match[] = { static const struct of_device_id rk3x_i2c_match[] = {
{ {
.compatible = "rockchip,rv1108-i2c", .compatible = "rockchip,rv1108-i2c",
.data = (void *)&rv1108_soc_data .data = &rv1108_soc_data
}, },
{ {
.compatible = "rockchip,rk3066-i2c", .compatible = "rockchip,rk3066-i2c",
.data = (void *)&rk3066_soc_data .data = &rk3066_soc_data
}, },
{ {
.compatible = "rockchip,rk3188-i2c", .compatible = "rockchip,rk3188-i2c",
.data = (void *)&rk3188_soc_data .data = &rk3188_soc_data
}, },
{ {
.compatible = "rockchip,rk3228-i2c", .compatible = "rockchip,rk3228-i2c",
.data = (void *)&rk3228_soc_data .data = &rk3228_soc_data
}, },
{ {
.compatible = "rockchip,rk3288-i2c", .compatible = "rockchip,rk3288-i2c",
.data = (void *)&rk3288_soc_data .data = &rk3288_soc_data
}, },
{ {
.compatible = "rockchip,rk3399-i2c", .compatible = "rockchip,rk3399-i2c",
.data = (void *)&rk3399_soc_data .data = &rk3399_soc_data
}, },
{}, {},
}; };
@ -1207,7 +1207,7 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
match = of_match_node(rk3x_i2c_match, np); match = of_match_node(rk3x_i2c_match, np);
i2c->soc_data = (struct rk3x_i2c_soc_data *)match->data; i2c->soc_data = match->data;
/* use common interface to get I2C timing properties */ /* use common interface to get I2C timing properties */
i2c_parse_fw_timings(&pdev->dev, &i2c->t, true); i2c_parse_fw_timings(&pdev->dev, &i2c->t, true);