From patchwork Tue May 7 10:52:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suzuki K Poulose X-Patchwork-Id: 163507 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:81:0:0:0:0 with SMTP id l1csp1185415ilm; Tue, 7 May 2019 03:55:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqyR+G3PmHf4LrQJ2Ta+KJ2jSb9uo+SOI9myy6cABD9ttSXFRlTZGiw9YRRq01J5STSYcWW1 X-Received: by 2002:a62:e10f:: with SMTP id q15mr40598485pfh.56.1557226544735; Tue, 07 May 2019 03:55:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557226544; cv=none; d=google.com; s=arc-20160816; b=IdP9xJPX45wcRUDeGJDkvY527mUbj09yK6huhchFfjFse0MCMxljrHZF286fHECdPv 44Mzc691Hbt7KfmAZyxKyuziQaEu/Lr5LnF/KxtqBnbcwSyqm7NFRhHaPgsd6fzbiT6U hM80JUAIc9x2Wmps9ZoTFD8n+gejCN/CMlkWWf/bjJERhm7Ifui8fUFnzNqaDaDp54aP BV7FA6D4gAgl6URW/66cTek/ksiXPy5erTxjCnfJ3MTxSf36Cfqpk+0L/Gf+QEyTPcnz Q9r1WLcyiSKmP0rxUCgN6krkX2DnjAunLCCl5MRz3oJblrivmc45qbNbmVMtcLeWMD1z sZ5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=slTNoya2jiDLZUQ/IQvAEAOlXXgAH+/6jduSj/bDVyo=; b=wIsyphr0kKGNMqnm6ND92IRmK6S9WJIvEoT+KKUZu24lJhU1ZclRXAnk3Wx5VaMOmd wjUwj74t2pUjZRxtoYzdug60426/Z/da/C91WsimNedwR7sz3AMctj5FAtADKgXxoOJO KM+L6eIF4qMHYU1ZW+lyS9qzHR9vxYcEhEHQ0NhMC8tpBaOJzZE7WHd5mpAo54JLQxMH m4udY9I6hmtGrf3xQXSCOs3lYxEKH5ecTvFujH6r0PM+2mOQgwH48RCqKanze2DctFdm UAHfX+M/Y2s5apjV1Lu0oDgNQ4TzqsHP7oyYuRG2+uOBaw2FivzSwbcUl0oZb+EZ9Y9y k8QA== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n22si19207493pgl.425.2019.05.07.03.55.44; Tue, 07 May 2019 03:55:44 -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; 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 S1727138AbfEGKyF (ORCPT + 30 others); Tue, 7 May 2019 06:54:05 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:50202 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727059AbfEGKyB (ORCPT ); Tue, 7 May 2019 06:54:01 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 40603374; Tue, 7 May 2019 03:54:01 -0700 (PDT) Received: from en101.cambridge.arm.com (en101.cambridge.arm.com [10.1.196.93]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0D0653F5AF; Tue, 7 May 2019 03:53:59 -0700 (PDT) From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, coresight@lists.linaro.org, rjw@rjwysocki.net, mathieu.poirier@linaro.org, Suzuki K Poulose Subject: [PATCH v3 14/30] coresight: platform: Make memory allocation helper generic Date: Tue, 7 May 2019 11:52:41 +0100 Message-Id: <1557226378-10131-15-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557226378-10131-1-git-send-email-suzuki.poulose@arm.com> References: <1557226378-10131-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename the of_coresight_alloc_memory() => coresight_alloc_conns() as it is independent of the underlying firmware type. This is in preparation for the ACPI support. Reviewed-by: Mathieu Poirier Signed-off-by: Suzuki K Poulose --- drivers/hwtracing/coresight/coresight-platform.c | 34 +++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-platform.c b/drivers/hwtracing/coresight/coresight-platform.c index 514cc2b..4c31299 100644 --- a/drivers/hwtracing/coresight/coresight-platform.c +++ b/drivers/hwtracing/coresight/coresight-platform.c @@ -17,6 +17,24 @@ #include #include +/* + * coresight_alloc_conns: Allocate connections record for each output + * port from the device. + */ +static int coresight_alloc_conns(struct device *dev, + struct coresight_platform_data *pdata) +{ + if (pdata->nr_outport) { + pdata->conns = devm_kzalloc(dev, pdata->nr_outport * + sizeof(*pdata->conns), + GFP_KERNEL); + if (!pdata->conns) + return -ENOMEM; + } + + return 0; +} + #ifdef CONFIG_OF static int of_dev_node_match(struct device *dev, void *data) { @@ -133,20 +151,6 @@ static void of_coresight_get_ports(const struct device_node *node, } } -static int of_coresight_alloc_memory(struct device *dev, - struct coresight_platform_data *pdata) -{ - if (pdata->nr_outport) { - pdata->conns = devm_kzalloc(dev, pdata->nr_outport * - sizeof(*pdata->conns), - GFP_KERNEL); - if (!pdata->conns) - return -ENOMEM; - } - - return 0; -} - int of_coresight_get_cpu(const struct device_node *node) { int cpu; @@ -252,7 +256,7 @@ of_get_coresight_platform_data(struct device *dev, if (!pdata->nr_outport) return pdata; - ret = of_coresight_alloc_memory(dev, pdata); + ret = coresight_alloc_conns(dev, pdata); if (ret) return ERR_PTR(ret);