diff options
author | Antony Pavlov <antonynpavlov@gmail.com> | 2015-04-29 11:56:58 +0300 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-30 08:12:57 +0200 |
commit | 377d261708d3057200c7ad9647fddb15169fea78 (patch) | |
tree | 9334590c4a63ec0b4ea01b91a7adc627a1ceb699 /drivers/i2c/busses/i2c-at91.c | |
parent | 92207cde490261c52cc804588561d8f3117cdf87 (diff) | |
download | barebox-377d261708d3057200c7ad9647fddb15169fea78.tar.gz barebox-377d261708d3057200c7ad9647fddb15169fea78.tar.xz |
of: use 'const void *' for struct of_device_id.data
Since 2011 barebox' of_device_id struct uses unsigned long type for data field:
struct of_device_id {
char *compatible;
unsigned long data;
};
Almost always struct of_device_id.data field are used as pointer
and need 'unsigned long' casting.
E.g. see 'git grep -A 4 of_device_id drivers/' output:
drivers/ata/sata-imx.c:static __maybe_unused struct of_device_id imx_sata_dt_ids[] = {
drivers/ata/sata-imx.c- {
drivers/ata/sata-imx.c- .compatible = "fsl,imx6q-ahci",
drivers/ata/sata-imx.c- .data = (unsigned long)&data_imx6,
drivers/ata/sata-imx.c- }, {
Here is of_device_id struct in linux kernel v4.0:
struct of_device_id {
char name[32];
char type[32];
char compatible[128];
const void *data;
};
Changing of_device_id.data type to 'const void *data' will increase
barebox' linux kernel compatibility and decrease number of 'unsigned
long' casts.
Part of the patch was done using the 'coccinelle' tool with the
following semantic patch:
@rule1@
identifier dev;
identifier type;
identifier func;
@@
func(...) {
<...
- dev_get_drvdata(dev, (unsigned long *)&type)
+ dev_get_drvdata(dev, (const void **)&type)
...>
}
@rule2@
identifier dev;
identifier type;
identifier func;
identifier data;
@@
func(...) {
<...
- dev_get_drvdata(dev, (unsigned long *)&type->data)
+ dev_get_drvdata(dev, (const void **)&type->data)
...>
}
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/i2c/busses/i2c-at91.c')
-rw-r--r-- | drivers/i2c/busses/i2c-at91.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c index 3a644cf62f..622c56d97b 100644 --- a/drivers/i2c/busses/i2c-at91.c +++ b/drivers/i2c/busses/i2c-at91.c @@ -387,22 +387,22 @@ static struct platform_device_id at91_twi_devtypes[] = { static struct of_device_id at91_twi_dt_ids[] = { { .compatible = "atmel,at91rm9200-i2c", - .data = (unsigned long) &at91rm9200_config, + .data = &at91rm9200_config, } , { .compatible = "atmel,at91sam9260-i2c", - .data = (unsigned long) &at91sam9260_config, + .data = &at91sam9260_config, } , { .compatible = "atmel,at91sam9261-i2c", - .data = (unsigned long) &at91sam9261_config, + .data = &at91sam9261_config, } , { .compatible = "atmel,at91sam9g20-i2c", - .data = (unsigned long) &at91sam9g20_config, + .data = &at91sam9g20_config, } , { .compatible = "atmel,at91sam9g10-i2c", - .data = (unsigned long) &at91sam9g10_config, + .data = &at91sam9g10_config, }, { .compatible = "atmel,at91sam9x5-i2c", - .data = (unsigned long) &at91sam9x5_config, + .data = &at91sam9x5_config, }, { /* sentinel */ } @@ -417,7 +417,7 @@ static int at91_twi_probe(struct device_d *dev) i2c_at91 = xzalloc(sizeof(struct at91_twi_dev)); - rc = dev_get_drvdata(dev, (unsigned long *)&i2c_data); + rc = dev_get_drvdata(dev, (const void **)&i2c_data); if (rc < 0) { dev_err(dev, "failed to retrieve driver data\n"); goto out_free; |