From patchwork Tue Sep 20 05:01:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 76575 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1294242qgf; Mon, 19 Sep 2016 22:01:02 -0700 (PDT) X-Received: by 10.98.87.90 with SMTP id l87mr52727289pfb.133.1474347662039; Mon, 19 Sep 2016 22:01:02 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n14si32706128pag.37.2016.09.19.22.01.01; Mon, 19 Sep 2016 22:01:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbcITFA6 (ORCPT + 27 others); Tue, 20 Sep 2016 01:00:58 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:34101 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750708AbcITFA5 (ORCPT ); Tue, 20 Sep 2016 01:00:57 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id u8K4xfFl013551; Tue, 20 Sep 2016 13:59:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u8K4xfFl013551 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1474347582; bh=j7QyOzibw+eRlayzakooGV1KLRMEmu+zRyfS/WrQW1U=; h=From:To:Cc:Subject:Date:From; b=J7LBBylfg93yq8gQLAWaXW1Y+f0jiEF7psvYUcrwRnc6t4qSkzBHxKTlPQR0B4cAO UgjQuGi+WngGHFLzFTtMy5R895BN18FDyKyq36bzTUTyhtusGNRuXlVHc8bOI9uVX2 a2cEF0lj9wPa9Z1x2fVVKhAAoNPoLxN542RcwyhgckzQU85jCjiQ7ox+hd83xeSowh 0pOJ1AoW6+vctpTpp0v04wMtMWbBUAQQRaHeQaK4GGDndqRw4cHj2lPGzUKR7R2x79 3kRvGY/3usvoVRphizAOXBroMszTuNje6R9hDquG/wErIZJMDPBjg31U89oLV7AC1Y mRiC7+GCpMocQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-arm-kernel@lists.infradead.org Cc: Masahiro Yamada , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: cache-uniphier: rename jump label to follow coding style guideline Date: Tue, 20 Sep 2016 14:01:43 +0900 Message-Id: <1474347703-17799-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Documentation/CodingStyle recommends to use label names which say what the goto does or why the goto exists. Signed-off-by: Masahiro Yamada --- arch/arm/mm/cache-uniphier.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 1.9.1 diff --git a/arch/arm/mm/cache-uniphier.c b/arch/arm/mm/cache-uniphier.c index eac516a..9a2a249 100644 --- a/arch/arm/mm/cache-uniphier.c +++ b/arch/arm/mm/cache-uniphier.c @@ -375,7 +375,7 @@ static int __init __uniphier_cache_init(struct device_node *np, pr_err("L%d: cache-line-size is unspecified or invalid\n", *cache_level); ret = -EINVAL; - goto err; + goto iounmap; } if (of_property_read_u32(np, "cache-sets", &data->nsets) || @@ -383,7 +383,7 @@ static int __init __uniphier_cache_init(struct device_node *np, pr_err("L%d: cache-sets is unspecified or invalid\n", *cache_level); ret = -EINVAL; - goto err; + goto iounmap; } if (of_property_read_u32(np, "cache-size", &cache_size) || @@ -391,7 +391,7 @@ static int __init __uniphier_cache_init(struct device_node *np, pr_err("L%d: cache-size is unspecified or invalid\n", *cache_level); ret = -EINVAL; - goto err; + goto iounmap; } data->way_present_mask = @@ -401,21 +401,21 @@ static int __init __uniphier_cache_init(struct device_node *np, if (!data->ctrl_base) { pr_err("L%d: failed to map control register\n", *cache_level); ret = -ENOMEM; - goto err; + goto iounmap; } data->rev_base = of_iomap(np, 1); if (!data->rev_base) { pr_err("L%d: failed to map revision register\n", *cache_level); ret = -ENOMEM; - goto err; + goto iounmap; } data->op_base = of_iomap(np, 2); if (!data->op_base) { pr_err("L%d: failed to map operation register\n", *cache_level); ret = -ENOMEM; - goto err; + goto iounmap; } data->way_ctrl_base = data->ctrl_base + 0xc00; @@ -465,7 +465,7 @@ static int __init __uniphier_cache_init(struct device_node *np, of_node_put(next_np); return ret; -err: +iounmap: iounmap(data->op_base); iounmap(data->rev_base); iounmap(data->ctrl_base);