diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-05-06 21:36:13 +0200 |
| commit | 4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f (patch) | |
| tree | 200fe335bd4bb4b2f29f3ff7149b4266b342f158 /drivers/pci | |
| parent | 67e4e8c056b1df440b44ff2af785f89de36883da (diff) | |
| parent | 377d261708d3057200c7ad9647fddb15169fea78 (diff) | |
| download | barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.gz barebox-4de5f732c0e8f98c7b893dcbfe1a4275d6d9ef4f.tar.xz | |
Merge branch 'for-next/of-device-id'
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); |