From patchwork Tue Sep 30 07:14:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 38123 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D59BA20549 for ; Tue, 30 Sep 2014 07:14:32 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf576733lbv.8 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:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=ovGrbAADZdsljHp6CIAHETTrYtxAHDe9X/vt/NV4398=; b=cAbQIV+G4uzO3zc5NW1Wd6DowKEg48LETvgeddCzQoGoprvDKP7Kemrp8hicYvRaD6 U1A5PEU9hWcMxm+iGVDI8nEO7RT+qB+g4xbJVu5m9/RzXjQ8UA0EUbP0PrRzfUAsVX9u dEQPEB3UTRIKarwAyj60WNKms/3EuFs3IZQI0FpWF6ZsAqxSn9bH9wChHmn5Mq4yi2kx eoI7PpNR1EoEYF7UywnlvO2U5MfXqpGjFJlm05kEZtZ/QGIBLsFGumtL6Wf8V2nhKbJq T5vjZYfUZA5ouQ+QbbZ5hrHWUPnWoG3U9lLI0M+p7Sz7uuNZKEJeKI5ThMRhdfWXPQkO JnYw== X-Gm-Message-State: ALoCoQn5gi1qKUVHk73/g6Zp4CVB9N4yZjtuOwG/kaIgisD0/7dJy1re57jJyPLw9Ln2mZd++XaE X-Received: by 10.181.23.197 with SMTP id ic5mr513900wid.7.1412061270661; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.1 with SMTP id u1ls5503laj.20.gmail; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) X-Received: by 10.152.21.98 with SMTP id u2mr45463162lae.60.1412061270243; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com [209.85.215.49]) by mx.google.com with ESMTPS id ez3si21388324lbc.12.2014.09.30.00.14.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 30 Sep 2014 00:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by mail-la0-f49.google.com with SMTP id ge10so4943018lab.36 for ; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) X-Received: by 10.112.75.233 with SMTP id f9mr8036378lbw.102.1412061270074; Tue, 30 Sep 2014 00:14:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp298860lbb; Tue, 30 Sep 2014 00:14:29 -0700 (PDT) X-Received: by 10.68.103.4 with SMTP id fs4mr68162547pbb.58.1412061268616; Tue, 30 Sep 2014 00:14:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id uf4si26189119pbc.38.2014.09.30.00.14.27 for ; Tue, 30 Sep 2014 00:14:28 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751411AbaI3HOZ (ORCPT + 27 others); Tue, 30 Sep 2014 03:14:25 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:62096 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750833AbaI3HOX (ORCPT ); Tue, 30 Sep 2014 03:14:23 -0400 Received: by mail-wi0-f175.google.com with SMTP id d1so2662703wiv.8 for ; Tue, 30 Sep 2014 00:14:22 -0700 (PDT) X-Received: by 10.180.101.129 with SMTP id fg1mr3455418wib.20.1412061262330; Tue, 30 Sep 2014 00:14:22 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id q5sm18143923wja.49.2014.09.30.00.14.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Sep 2014 00:14:21 -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 1/3] pinctrl: nomadik: use util function to reserve maps Date: Tue, 30 Sep 2014 09:14:18 +0200 Message-Id: <1412061258-20750-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Stop brewing our own pin map reservation function and use the generic code. Signed-off-by: Linus Walleij --- drivers/pinctrl/nomadik/pinctrl-nomadik.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index c093d75a022a..9fe31daf9230 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -32,6 +32,7 @@ #include #include "pinctrl-nomadik.h" #include "../core.h" +#include "../pinctrl-utils.h" /* * The GPIO module in the Nomadik family of Systems-on-Chip is an @@ -1349,28 +1350,6 @@ static void nmk_pinctrl_dt_free_map(struct pinctrl_dev *pctldev, kfree(map); } -static int nmk_dt_reserve_map(struct pinctrl_map **map, unsigned *reserved_maps, - unsigned *num_maps, unsigned reserve) -{ - unsigned old_num = *reserved_maps; - unsigned new_num = *num_maps + reserve; - struct pinctrl_map *new_map; - - if (old_num >= new_num) - return 0; - - new_map = krealloc(*map, sizeof(*new_map) * new_num, GFP_KERNEL); - if (!new_map) - return -ENOMEM; - - memset(new_map + old_num, 0, (new_num - old_num) * sizeof(*new_map)); - - *map = new_map; - *reserved_maps = new_num; - - return 0; -} - static int nmk_dt_add_map_mux(struct pinctrl_map **map, unsigned *reserved_maps, unsigned *num_maps, const char *group, const char *function) @@ -1561,7 +1540,7 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, reserve *= ret; - ret = nmk_dt_reserve_map(map, reserved_maps, num_maps, reserve); + ret = pinctrl_utils_reserve_map(pctldev, map, reserved_maps, num_maps, reserve); if (ret < 0) goto exit;