diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-14 04:29:15 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-14 04:29:15 -0400 |
| commit | 7a0b8610d3243fe4fc2422f5e4658676c3d9c6ab (patch) | |
| tree | 56de21314e7d8a3756b730ed55257cb49d654a8f /drivers/memory | |
| parent | 71fe67e0e23446074e61a10e1fec21dd297d49fa (diff) | |
| parent | d507178f2ebb7bde5b3f64557f1c8f80e7b82541 (diff) | |
Merge tag 'gpmc-omap-for-v4.18' of https://github.com/rogerq/linux into next/drivers
OMAP-GPMC: driver updates for v4.18
* get rid of a redundant NULL check in gpmc_probe_dt_children()
* tag 'gpmc-omap-for-v4.18' of https://github.com/rogerq/linux:
memory: omap-gpmc: Avoid redundant NULL check
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 90a66b3f7ae1..c215287e80cf 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c | |||
| @@ -2060,8 +2060,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, | |||
| 2060 | * timings. | 2060 | * timings. |
| 2061 | */ | 2061 | */ |
| 2062 | name = gpmc_cs_get_name(cs); | 2062 | name = gpmc_cs_get_name(cs); |
| 2063 | if (name && child->name && of_node_cmp(child->name, name) == 0) | 2063 | if (name && of_node_cmp(child->name, name) == 0) |
| 2064 | goto no_timings; | 2064 | goto no_timings; |
| 2065 | 2065 | ||
| 2066 | ret = gpmc_cs_request(cs, resource_size(&res), &base); | 2066 | ret = gpmc_cs_request(cs, resource_size(&res), &base); |
| 2067 | if (ret < 0) { | 2067 | if (ret < 0) { |