diff options
| author | Rob Herring <robh@kernel.org> | 2018-03-08 18:21:07 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-03-08 18:21:07 +0300 |
| commit | c679fa6e3aaa5c58fc514b5b88cfa82774b8d390 (patch) | |
| tree | 0c10b339368bd1795152a66a4e245e6f654fb3ec /drivers/of | |
| parent | bdb7013df910681f84eff27b07791d4c160cb76f (diff) | |
| parent | 4fd98e374fd377ae0458a9dc44aa779cf9631ddd (diff) | |
| download | linux-c679fa6e3aaa5c58fc514b5b88cfa82774b8d390.tar.xz | |
Merge branch 'dtc-update' into dt/next
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/property.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/of/property.c b/drivers/of/property.c index 36ed84e26d9c..f46828e3b082 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -977,11 +977,11 @@ static int of_fwnode_graph_parse_endpoint(const struct fwnode_handle *fwnode, return 0; } -static void * +static const void * of_fwnode_device_get_match_data(const struct fwnode_handle *fwnode, const struct device *dev) { - return (void *)of_device_get_match_data(dev); + return of_device_get_match_data(dev); } const struct fwnode_operations of_fwnode_ops = { |