From patchwork Tue Dec 10 14:53:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 181133 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp5606412och; Tue, 10 Dec 2019 06:54:47 -0800 (PST) X-Google-Smtp-Source: APXvYqzJ/eh4kR9AGQjuGzk7qUQbJxFsxgsmZKv0UY0WAYfbJeU0fxDKMn46le57I60B9rzlU1OK X-Received: by 2002:a54:4085:: with SMTP id i5mr4284735oii.17.1575989687396; Tue, 10 Dec 2019 06:54:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575989687; cv=none; d=google.com; s=arc-20160816; b=uJw+SLl/q7/GhuoxKUyuEGw/wDccegXig5qtFecowRcLurwRYpokXQLmxMPjnttowo YssusIXtJCc1nAazQdcDrI2LXSinLeb9OA1cHcIoqruhojrZ6u6IAF/wdo7IQBX8aSzD Y7G/fdDMBUZ5drS/JPiTawT9Y6zY9x564NxYdJ/CdG4Zu0FklmpzNrKRLicN9Qg9D+yp IqNIzTGFD82mOifYfnVEZR5oRIrOGLJgliFVJmyMBM7703U1MczWk07h8yBZBH2J8u8Z /vnPigzgsskp5VVJdU1ryxS+WezW6U6MDWGD0W3XmKVvqtdiZEXxlpcqYjfRvWESDO0w YboQ== 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=/bq/9REd8xQ0cDKvXVulq4kByxvwOKetpZp/z3K/Wzs=; b=AGsdHELlcG5WPprSROs9ScbAI4UeUFX7UcuigQUKXAY3wCLEzybMZwgtiC2x7UYQna eaDJAtby9UkQuEnVCFskdEiiIOJJfWZH38kIvyiS95ZBe4m/DsXuQ758MjXh1RBo+QM4 tjNLy2BrNn3IUUpTj6mon46/dAWKgFwH1t+AFs0XaJQ2V4zhYhevKAVn427DavhHdONH Pl4o0ahpZHurZGswhI72G8SKXbj8S/CtO/mwWYBBIHogDZhLL6OpON2e/Ehy335UHFCX aSh/rEECc0o3b2Hce6AfyDtwkuX7DB8xnbadUd1U1pfsocop56XvmcwuBMf5pFWLG6QU ORLQ== 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 a12si2053863oie.87.2019.12.10.06.54.46; Tue, 10 Dec 2019 06:54:47 -0800 (PST) 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 S1727709AbfLJOyP (ORCPT + 27 others); Tue, 10 Dec 2019 09:54:15 -0500 Received: from foss.arm.com ([217.140.110.172]:47144 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727664AbfLJOyK (ORCPT ); Tue, 10 Dec 2019 09:54:10 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2668D113E; Tue, 10 Dec 2019 06:54:10 -0800 (PST) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.196.42]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 776E63F67D; Tue, 10 Dec 2019 06:54:09 -0800 (PST) From: Sudeep Holla To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Cristian Marussi Subject: [PATCH 06/15] firmware: arm_scmi: Update scmi_prot_init_fn_t to use device instead of handle Date: Tue, 10 Dec 2019 14:53:36 +0000 Message-Id: <20191210145345.11616-7-sudeep.holla@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191210145345.11616-1-sudeep.holla@arm.com> References: <20191210145345.11616-1-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The scmi bus now supports multiple device per protocol. So, in order to initialise each device and it's attributes, it's better to pass scmi_device pointer to the protocol initialise function rather than scmi_handle. scmi_handle can be still fetched from the scmi_device pointer. Signed-off-by: Sudeep Holla --- drivers/firmware/arm_scmi/bus.c | 6 +++--- drivers/firmware/arm_scmi/clock.c | 3 ++- drivers/firmware/arm_scmi/perf.c | 3 ++- drivers/firmware/arm_scmi/power.c | 3 ++- drivers/firmware/arm_scmi/reset.c | 3 ++- drivers/firmware/arm_scmi/sensors.c | 3 ++- include/linux/scmi_protocol.h | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/drivers/firmware/arm_scmi/bus.c b/drivers/firmware/arm_scmi/bus.c index 3714e6307b05..f619da2634a6 100644 --- a/drivers/firmware/arm_scmi/bus.c +++ b/drivers/firmware/arm_scmi/bus.c @@ -51,13 +51,13 @@ static int scmi_dev_match(struct device *dev, struct device_driver *drv) return 0; } -static int scmi_protocol_init(int protocol_id, struct scmi_handle *handle) +static int scmi_protocol_init(int protocol_id, struct scmi_device *dev) { scmi_prot_init_fn_t fn = idr_find(&scmi_protocols, protocol_id); if (unlikely(!fn)) return -EINVAL; - return fn(handle); + return fn(dev); } static int scmi_dev_probe(struct device *dev) @@ -74,7 +74,7 @@ static int scmi_dev_probe(struct device *dev) if (!scmi_dev->handle) return -EPROBE_DEFER; - ret = scmi_protocol_init(scmi_dev->protocol_id, scmi_dev->handle); + ret = scmi_protocol_init(scmi_dev->protocol_id, scmi_dev); if (ret) return ret; diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index 922b22aaaf84..6c24eb8a4e68 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -310,11 +310,12 @@ static struct scmi_clk_ops clk_ops = { .disable = scmi_clock_disable, }; -static int scmi_clock_protocol_init(struct scmi_handle *handle) +static int scmi_clock_protocol_init(struct scmi_device *dev) { u32 version; int clkid, ret; struct clock_info *cinfo; + struct scmi_handle *handle = dev->handle; if (handle->clk_ops && handle->clk_priv) return 0; /* initialised already for the first device */ diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c index 55c2a4c21ccb..4f02bfba98ba 100644 --- a/drivers/firmware/arm_scmi/perf.c +++ b/drivers/firmware/arm_scmi/perf.c @@ -704,11 +704,12 @@ static struct scmi_perf_ops perf_ops = { .est_power_get = scmi_dvfs_est_power_get, }; -static int scmi_perf_protocol_init(struct scmi_handle *handle) +static int scmi_perf_protocol_init(struct scmi_device *dev) { int domain; u32 version; struct scmi_perf_info *pinfo; + struct scmi_handle *handle = dev->handle; if (handle->perf_ops && handle->perf_priv) return 0; /* initialised already for the first device */ diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c index 9a7593238b8f..5a8faa369d82 100644 --- a/drivers/firmware/arm_scmi/power.c +++ b/drivers/firmware/arm_scmi/power.c @@ -179,11 +179,12 @@ static struct scmi_power_ops power_ops = { .state_get = scmi_power_state_get, }; -static int scmi_power_protocol_init(struct scmi_handle *handle) +static int scmi_power_protocol_init(struct scmi_device *dev) { int domain; u32 version; struct scmi_power_info *pinfo; + struct scmi_handle *handle = dev->handle; if (handle->power_ops && handle->power_priv) return 0; /* initialised already for the first device */ diff --git a/drivers/firmware/arm_scmi/reset.c b/drivers/firmware/arm_scmi/reset.c index 809dc8faee1e..438d74a2c80a 100644 --- a/drivers/firmware/arm_scmi/reset.c +++ b/drivers/firmware/arm_scmi/reset.c @@ -189,11 +189,12 @@ static struct scmi_reset_ops reset_ops = { .deassert = scmi_reset_domain_deassert, }; -static int scmi_reset_protocol_init(struct scmi_handle *handle) +static int scmi_reset_protocol_init(struct scmi_device *dev) { int domain; u32 version; struct scmi_reset_info *pinfo; + struct scmi_handle *handle = dev->handle; if (handle->reset_ops && handle->reset_priv) return 0; /* initialised already for the first device */ diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c index b7f92c37c8a4..afa51bedfa5d 100644 --- a/drivers/firmware/arm_scmi/sensors.c +++ b/drivers/firmware/arm_scmi/sensors.c @@ -271,10 +271,11 @@ static struct scmi_sensor_ops sensor_ops = { .reading_get = scmi_sensor_reading_get, }; -static int scmi_sensors_protocol_init(struct scmi_handle *handle) +static int scmi_sensors_protocol_init(struct scmi_device *dev) { u32 version; struct sensors_info *sinfo; + struct scmi_handle *handle = dev->handle; if (handle->sensor_ops && handle->sensor_priv) return 0; /* initialised already for the first device */ diff --git a/include/linux/scmi_protocol.h b/include/linux/scmi_protocol.h index 5c873a59b387..b676825e6eb0 100644 --- a/include/linux/scmi_protocol.h +++ b/include/linux/scmi_protocol.h @@ -316,6 +316,6 @@ static inline void scmi_driver_unregister(struct scmi_driver *driver) {} #define module_scmi_driver(__scmi_driver) \ module_driver(__scmi_driver, scmi_register, scmi_unregister) -typedef int (*scmi_prot_init_fn_t)(struct scmi_handle *); +typedef int (*scmi_prot_init_fn_t)(struct scmi_device *); int scmi_protocol_register(int protocol_id, scmi_prot_init_fn_t fn); void scmi_protocol_unregister(int protocol_id);