diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2018-06-12 10:01:07 +1000 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-07-10 08:08:57 -0600 |
| commit | b01dcdd86e8c20599ee9293392d6fef8397fbc5d (patch) | |
| tree | 7d455bf2b944356432f2aa39144ef37d9c90db7d /drivers/of/address.c | |
| parent | b7394b7f5870234b77bf60224eb543a1b2d038a2 (diff) | |
| download | linux-b01dcdd86e8c20599ee9293392d6fef8397fbc5d.tar.gz linux-b01dcdd86e8c20599ee9293392d6fef8397fbc5d.tar.bz2 linux-b01dcdd86e8c20599ee9293392d6fef8397fbc5d.zip | |
drivers/of: Make of_io_request_and_map() "name" argument optional
These days of_address_to_resource() puts a reasonable name
in the resource struct, thus make the "name" argument an
optional override.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/address.c')
| -rw-r--r-- | drivers/of/address.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index 53349912ac75..7ddbf0a1ab86 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -846,7 +846,7 @@ EXPORT_SYMBOL(of_iomap); * for a given device_node * @device: the device whose io range will be mapped * @index: index of the io range - * @name: name of the resource + * @name: name "override" for the memory region request or NULL * * Returns a pointer to the requested and mapped memory or an ERR_PTR() encoded * error code on failure. Usage example: @@ -856,7 +856,7 @@ EXPORT_SYMBOL(of_iomap); * return PTR_ERR(base); */ void __iomem *of_io_request_and_map(struct device_node *np, int index, - const char *name) + const char *name) { struct resource res; void __iomem *mem; @@ -864,6 +864,8 @@ void __iomem *of_io_request_and_map(struct device_node *np, int index, if (of_address_to_resource(np, index, &res)) return IOMEM_ERR_PTR(-EINVAL); + if (!name) + name = res.name; if (!request_mem_region(res.start, resource_size(&res), name)) return IOMEM_ERR_PTR(-EBUSY); |