Merge tag 'gpmc-omap-for-v4.18' of https://github.com/rogerq/linux in…

…to 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 <[email protected]>
mrcsosa · May 14, 2018 · 7a0b861 · 7a0b861
2 parents 71fe67e + d507178
commit 7a0b861
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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,
 	 * timings.
 	 */
 	name = gpmc_cs_get_name(cs);
-	if (name && child->name && of_node_cmp(child->name, name) == 0)
-			goto no_timings;
+	if (name && of_node_cmp(child->name, name) == 0)
+		goto no_timings;
 
 	ret = gpmc_cs_request(cs, resource_size(&res), &base);
 	if (ret < 0) {