From patchwork Tue Sep 30 07:14:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 394790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4B0F31400D5 for ; Tue, 30 Sep 2014 17:15:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751530AbaI3HOd (ORCPT ); Tue, 30 Sep 2014 03:14:33 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:44457 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751472AbaI3HOb (ORCPT ); Tue, 30 Sep 2014 03:14:31 -0400 Received: by mail-wi0-f176.google.com with SMTP id n3so4892871wiv.3 for ; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AvCKE1cW2TuP2Dl2I/yOgRP/f0KIhIQJVGByHuIoYi8=; b=EW71NgplTRt+ZHuHcZ1H3hVP6mezCETA8T5Nl6od+gkcevfYTkBONzYjSc3pKAeyPj /l83lI0K9mi946vXzlU4DGHDBdArM128qW40d7owS00uesNReamR9ZSSC35sUUtvbXiX B/HlykjO2p5YECnZPyhL7tPAOEEOp3l8loPrwaudXiQceMJcdcPWcgdzBujbGcfw2P9j oRYMP5r/VoCXSxU4w99rVVP6qsvDcxtJwBDf1WbUaL9sNjOyqyyLgyfRRxFBVo5zcOjg KP3xQ+30zXPSrjo4ID8qJ17F/E7nGSlZTRpPPfeqJ0IFP33gbkl5CewYrmf610SaqgU7 +C0Q== X-Gm-Message-State: ALoCoQlQh3PBx70AQYKqOKGw0+6VuOZF8pqyNZGbvL6XbuIn2Cf8JEuCTNV1FIWqcHKgaPe8xDyy X-Received: by 10.194.57.105 with SMTP id h9mr8904923wjq.116.1412061270765; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id v9sm18187211wjy.14.2014.09.30.00.14.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Sep 2014 00:14:29 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH 2/3] pinctrl: nomadik: use utils map free function Date: Tue, 30 Sep 2014 09:14:26 +0200 Message-Id: <1412061266-20790-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Stop brewing our own map free function and rely on the pinctrl utils helpers. Signed-off-by: Linus Walleij --- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index 9fe31daf9230..6c9667a44b7b 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -1339,17 +1339,6 @@ static void nmk_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s, nmk_gpio_dbg_show_one(s, pctldev, chip, offset - chip->base, offset); } -static void nmk_pinctrl_dt_free_map(struct pinctrl_dev *pctldev, - struct pinctrl_map *map, unsigned num_maps) -{ - int i; - - for (i = 0; i < num_maps; i++) - if (map[i].type == PIN_MAP_TYPE_CONFIGS_PIN) - kfree(map[i].data.configs.configs); - kfree(map); -} - static int nmk_dt_add_map_mux(struct pinctrl_map **map, unsigned *reserved_maps, unsigned *num_maps, const char *group, const char *function) @@ -1581,7 +1570,7 @@ static int nmk_pinctrl_dt_node_to_map(struct pinctrl_dev *pctldev, ret = nmk_pinctrl_dt_subnode_to_map(pctldev, np, map, &reserved_maps, num_maps); if (ret < 0) { - nmk_pinctrl_dt_free_map(pctldev, *map, *num_maps); + pinctrl_utils_dt_free_map(pctldev, *map, *num_maps); return ret; } } @@ -1595,7 +1584,7 @@ static const struct pinctrl_ops nmk_pinctrl_ops = { .get_group_pins = nmk_get_group_pins, .pin_dbg_show = nmk_pin_dbg_show, .dt_node_to_map = nmk_pinctrl_dt_node_to_map, - .dt_free_map = nmk_pinctrl_dt_free_map, + .dt_free_map = pinctrl_utils_dt_free_map, }; static int nmk_pmx_get_funcs_cnt(struct pinctrl_dev *pctldev)