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/pci | |
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/pci')
-rw-r--r-- | drivers/pci/pci-mvebu.c | 4 | ||||
-rw-r--r-- | drivers/pci/pci-tegra.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/pci-mvebu.c b/drivers/pci/pci-mvebu.c index 5e2b87a9e1..da2459bafe 100644 --- a/drivers/pci/pci-mvebu.c +++ b/drivers/pci/pci-mvebu.c @@ -383,10 +383,10 @@ static struct mvebu_pcie_ops __maybe_unused armada_xp_ops = { static struct of_device_id mvebu_pcie_dt_ids[] = { #if defined(CONFIG_ARCH_ARMADA_XP) - { .compatible = "marvell,armada-xp-pcie", .data = (u32)&armada_xp_ops, }, + { .compatible = "marvell,armada-xp-pcie", .data = &armada_xp_ops, }, #endif #if defined(CONFIG_ARCH_ARMADA_370) - { .compatible = "marvell,armada-370-pcie", .data = (u32)&armada_370_ops, }, + { .compatible = "marvell,armada-370-pcie", .data = &armada_370_ops, }, #endif #if defined(CONFIG_ARCH_DOVE) { .compatible = "marvell,dove-pcie", }, diff --git a/drivers/pci/pci-tegra.c b/drivers/pci/pci-tegra.c index 1e7907e5b1..b532c464a6 100644 --- a/drivers/pci/pci-tegra.c +++ b/drivers/pci/pci-tegra.c @@ -1239,13 +1239,13 @@ static const struct tegra_pcie_soc_data tegra124_pcie_data = { static __maybe_unused struct of_device_id tegra_pcie_of_match[] = { { .compatible = "nvidia,tegra124-pcie", - .data = (unsigned long)&tegra124_pcie_data + .data = &tegra124_pcie_data }, { .compatible = "nvidia,tegra30-pcie", - .data = (unsigned long)&tegra30_pcie_data + .data = &tegra30_pcie_data }, { .compatible = "nvidia,tegra20-pcie", - .data = (unsigned long)&tegra20_pcie_data + .data = &tegra20_pcie_data }, { /* sentinel */ }, @@ -1262,7 +1262,7 @@ static int tegra_pcie_probe(struct device_d *dev) INIT_LIST_HEAD(&pcie->buses); INIT_LIST_HEAD(&pcie->ports); - dev_get_drvdata(dev, (unsigned long *)&pcie->soc_data); + dev_get_drvdata(dev, (const void **)&pcie->soc_data); pcie->dev = dev; err = tegra_pcie_parse_dt(pcie); |