From patchwork Fri Oct 19 07:49:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 986607 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="citZ6Sob"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bytJ2bdhz9s5c for ; Fri, 19 Oct 2018 18:56:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=TR6AaiZdqeHImuSvzl1RkAEdsjud5fpuHZVidcFRIkk=; b=citZ6SobAgtL39/0ml+1KSNGGj ifd37qHiaGFhD6UQ8vc+jT2M94/WaCgGCM81nIf30ex/XGmkmQEpnngckgQ+0QDFfK8pMBl44S5OY AUJ4E3DgEWcyDQVWJsG+dWapqcW2s13PjWpEdK/vFT0wi8DbugzV5hvW1XfJmEkBWWdfAN09XKDu6 UEk9z7wcTJHRWgSLA8J/lQN4hUsXDI24src5fz9a7j7rsnELxuwJhpJQpVSD3bFwDUhwe0teMnmjR 1wM8/ewMRoYrr4mmbpe3PT6E1yaFYF9hoDq+9rcXwbJRaTPvPi7Z6orb1XjpzdwjiHMwTAfPREy9I cJY4kzuw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDPeE-0000VP-MF; Fri, 19 Oct 2018 07:56:42 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDPXV-0003Ss-FR for linux-mtd@lists.infradead.org; Fri, 19 Oct 2018 07:50:19 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id B844520DE2; Fri, 19 Oct 2018 09:49:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (91-160-177-164.subs.proxad.net [91.160.177.164]) by mail.bootlin.com (Postfix) with ESMTPSA id A60AA20DE6; Fri, 19 Oct 2018 09:49:14 +0200 (CEST) From: Boris Brezillon To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , linux-mtd@lists.infradead.org Subject: [PATCH v2 09/15] mtd: maps: physmap: Fix coding style issues reported by checkpatch Date: Fri, 19 Oct 2018 09:49:02 +0200 Message-Id: <20181019074908.13226-10-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181019074908.13226-1-boris.brezillon@bootlin.com> References: <20181019074908.13226-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181019_004945_855057_69DECF60 X-CRM114-Status: GOOD ( 19.59 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Linus Walleij , Rob Herring , Kumar Gala , Ricardo Ribalda Delgado MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Fix the following coding style issues: - != NULL and == NULL test replaced by ! (or nothing) - split over 80 chars lines - add missing braces in multi-line if() {} else {} statements Signed-off-by: Boris Brezillon Reviewed-by: Ricardo Ribalda Delgado --- Changes in v2: - Add Ricardo's R-b --- drivers/mtd/maps/physmap.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c index 7d30f3524d35..e27051bc5dc6 100644 --- a/drivers/mtd/maps/physmap.c +++ b/drivers/mtd/maps/physmap.c @@ -38,7 +38,7 @@ static int physmap_flash_remove(struct platform_device *dev) int i, err; info = platform_get_drvdata(dev); - if (info == NULL) + if (!info) return 0; physmap_data = dev_get_platdata(&dev->dev); @@ -53,7 +53,7 @@ static int physmap_flash_remove(struct platform_device *dev) } for (i = 0; i < info->nmaps; i++) { - if (info->mtds[i] != NULL) + if (info->mtds[i]) map_destroy(info->mtds[i]); } @@ -90,10 +90,12 @@ static void physmap_set_vpp(struct map_info *map, int state) } static const char * const rom_probe_types[] = { - "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL }; + "cfi_probe", "jedec_probe", "qinfo_probe", "map_rom", NULL +}; static const char * const part_probe_types[] = { - "cmdlinepart", "RedBoot", "afs", NULL }; + "cmdlinepart", "RedBoot", "afs", NULL +}; static int physmap_flash_probe(struct platform_device *dev) { @@ -105,11 +107,10 @@ static int physmap_flash_probe(struct platform_device *dev) int i; physmap_data = dev_get_platdata(&dev->dev); - if (physmap_data == NULL) + if (!physmap_data) return -ENODEV; - info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info), - GFP_KERNEL); + info = devm_kzalloc(&dev->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; @@ -163,13 +164,16 @@ static int physmap_flash_probe(struct platform_device *dev) simple_map_init(&info->maps[i]); probe_type = rom_probe_types; - if (physmap_data->probe_type == NULL) { - for (; info->mtds[i] == NULL && *probe_type != NULL; probe_type++) - info->mtds[i] = do_map_probe(*probe_type, &info->maps[i]); - } else - info->mtds[i] = do_map_probe(physmap_data->probe_type, &info->maps[i]); + if (!physmap_data->probe_type) { + for (; !info->mtds[i] && *probe_type; probe_type++) + info->mtds[i] = do_map_probe(*probe_type, + &info->maps[i]); + } else { + info->mtds[i] = do_map_probe(physmap_data->probe_type, + &info->maps[i]); + } - if (info->mtds[i] == NULL) { + if (!info->mtds[i]) { dev_err(&dev->dev, "map_probe failed\n"); err = -ENXIO; goto err_out; @@ -185,7 +189,7 @@ static int physmap_flash_probe(struct platform_device *dev) */ info->cmtd = mtd_concat_create(info->mtds, info->nmaps, dev_name(&dev->dev)); - if (info->cmtd == NULL) + if (!info->cmtd) err = -ENXIO; } if (err) @@ -231,7 +235,6 @@ static struct platform_driver physmap_flash_driver = { }, }; - #ifdef CONFIG_MTD_PHYSMAP_COMPAT static struct physmap_flash_data physmap_flash_data = { .width = CONFIG_MTD_PHYSMAP_BANKWIDTH,