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 /include | |
| 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 'include')
| -rw-r--r-- | include/driver.h | 2 | ||||
| -rw-r--r-- | include/linux/clk.h | 2 | ||||
| -rw-r--r-- | include/of.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/driver.h b/include/driver.h index 1745717315..d0cdcc9715 100644 --- a/include/driver.h +++ b/include/driver.h @@ -512,7 +512,7 @@ int devfs_create_partitions(const char *devname, #define DRV_OF_COMPAT(compat) \ IS_ENABLED(CONFIG_OFDEVICE) ? (compat) : NULL -int dev_get_drvdata(struct device_d *dev, unsigned long *data); +int dev_get_drvdata(struct device_d *dev, const void **data); int device_match_of_modalias(struct device_d *dev, struct driver_d *drv); diff --git a/include/linux/clk.h b/include/linux/clk.h index 56890a0d5e..4aeec63a84 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -322,7 +322,7 @@ struct of_phandle_args; #define CLK_OF_DECLARE(name, compat, fn) \ const struct of_device_id __clk_of_table_##name \ __attribute__ ((unused,section (".__clk_of_table_" __stringify(name)))) \ - = { .compatible = compat, .data = (u32)fn } + = { .compatible = compat, .data = fn } #if defined(CONFIG_OFTREE) && defined(CONFIG_COMMON_CLK_OF_PROVIDER) int of_clk_add_provider(struct device_node *np, diff --git a/include/of.h b/include/of.h index 2dcb613a77..e73cd7a446 100644 --- a/include/of.h +++ b/include/of.h @@ -37,7 +37,7 @@ struct device_node { struct of_device_id { char *compatible; - unsigned long data; + const void *data; }; #define MAX_PHANDLE_ARGS 8 |