From patchwork Fri Feb 22 20:05:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10826921 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CBEB81390 for ; Fri, 22 Feb 2019 20:06:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB05F32AA2 for ; Fri, 22 Feb 2019 20:06:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF0A132AAF; Fri, 22 Feb 2019 20:06:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39C5232AA2 for ; Fri, 22 Feb 2019 20:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727616AbfBVUGJ (ORCPT ); Fri, 22 Feb 2019 15:06:09 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:33359 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727136AbfBVUF3 (ORCPT ); Fri, 22 Feb 2019 15:05:29 -0500 Received: by mail-pg1-f195.google.com with SMTP id h11so1612067pgl.0; Fri, 22 Feb 2019 12:05:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8IpqrOjtcHvSHZzGSsy3LrpVR3xBgwuw+n4I/t+wAj8=; b=tK9hd+yam+zxDMwJOulwwlm/sH5qBgOKWE2uxObg8BBMfHWJIFM68fK3kCWdvtFc+l bJrEjhqleW909qYiq0g+JbisXJ8+efN31sPhSAjtSIsxCQ8vaMYhuf0+9T8uF2Dq8rdh zoqLqZIZqFbesmDDjhEH4CYaw/HYaOm/WxIF+C3mpyLk8OuwKPpcjteQvwOQ7HBmECao uJAvI4pFjQPeWoox0hhTtzdnWZ9wdxvY+Dr19q3TAdavR1YO7zgn+kzU4M/hjc7CtQB5 RnJwhWnZC6eKJlMZRRMtoZ1CstfE6oBnO/XMnb6fJk3eAmQetkoM7aF1aSsdl/3aRsri 2+oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8IpqrOjtcHvSHZzGSsy3LrpVR3xBgwuw+n4I/t+wAj8=; b=ofURtS1oPHiKjnjymem73210LWCI9QUrt5wYmAS4OipAchU005LLYEHdEHRW09Sbk/ D/ztEeq39ROY1KQRiAv101uTDiSMYIvLh+Xt9H84eUkvT0AA2KK00RIfnL93R8axGmrr SZ/Av4a4UVLbto4e92+2YcJNMWvxlHdPHuMcq2MabRLD/gGe1f/hqJk9aCtrZVEOP4b5 Ooy2b9gZRqdASTkc1748OiLrmMuIrhV9dA6/Ps1C5yyUPcoBHLICzQNRAatiEoFPOQ/Z IV1+Ms5hd2aaCfi/cfW5MrR8L2bBNgwxQNf5XS+kegRuT+bw/Bu8Yhjr6OIWr9Ut1U+C faXg== X-Gm-Message-State: AHQUAubLLD3xeWwFohJ6aot/V+jQMk390CKY6bQWPE4BUkgfZfMcGPvh f0O4/COZCTnKKTxES6opKqsZUOW9 X-Google-Smtp-Source: AHgI3IY+yogH+r8S+nP917T5Bfx7tVf/DHo7Yz/3ha9F80VsfBnSDfiHV98TNBcGXcMu07EdnCXDnQ== X-Received: by 2002:a62:6ec3:: with SMTP id j186mr6143508pfc.89.1550865928260; Fri, 22 Feb 2019 12:05:28 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id h79sm7471046pfj.186.2019.02.22.12.05.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Feb 2019 12:05:27 -0800 (PST) From: Andrey Smirnov To: linux-pm@vger.kernel.org Cc: Andrey Smirnov , Chris Healy , Lucas Stach , Zhang Rui , Eduardo Valentin , Daniel Lezcano , linux-imx@nxp.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 06/13] thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data Date: Fri, 22 Feb 2019 12:05:01 -0800 Message-Id: <20190222200508.26325-7-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190222200508.26325-1-andrew.smirnov@gmail.com> References: <20190222200508.26325-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Embed per-sensor data into struct qoriq_tmu_data so we can drop the code allocating it. This also allows us to get rid of per-sensor back reference to struct qoriq_tmu_data since now its address can be caluclated using container_of(). Signed-off-by: Andrey Smirnov Cc: Chris Healy Cc: Lucas Stach Cc: Zhang Rui Cc: Eduardo Valentin Cc: Daniel Lezcano Cc: linux-imx@nxp.com Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- drivers/thermal/qoriq_thermal.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c index e281bdcfa11f..deb5cb6a0baf 100644 --- a/drivers/thermal/qoriq_thermal.c +++ b/drivers/thermal/qoriq_thermal.c @@ -59,22 +59,24 @@ struct qoriq_tmu_regs { u32 ttr3cr; /* Temperature Range 3 Control Register */ }; -struct qoriq_tmu_data; - /* * Thermal zone data */ struct qoriq_sensor { - struct qoriq_tmu_data *qdata; int id; }; struct qoriq_tmu_data { struct qoriq_tmu_regs __iomem *regs; bool little_endian; - struct qoriq_sensor *sensor[SITES_MAX]; + struct qoriq_sensor sensor[SITES_MAX]; }; +static struct qoriq_tmu_data *qoriq_sensor_to_data(struct qoriq_sensor *s) +{ + return container_of(s, struct qoriq_tmu_data, sensor[s->id]); +} + static void tmu_write(struct qoriq_tmu_data *p, u32 val, void __iomem *addr) { if (p->little_endian) @@ -94,7 +96,7 @@ static u32 tmu_read(struct qoriq_tmu_data *p, void __iomem *addr) static int tmu_get_temp(void *p, int *temp) { struct qoriq_sensor *qsensor = p; - struct qoriq_tmu_data *qdata = qsensor->qdata; + struct qoriq_tmu_data *qdata = qoriq_sensor_to_data(qsensor); u32 val; val = tmu_read(qdata, &qdata->regs->site[qsensor->id].tritsr); @@ -114,15 +116,9 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev) for (id = 0; id < SITES_MAX; id++) { struct thermal_zone_device *tzd; - struct qoriq_sensor *s; - - s = qdata->sensor[id] = devm_kzalloc(&pdev->dev, - sizeof(struct qoriq_sensor), GFP_KERNEL); - if (!qdata->sensor[id]) - return -ENOMEM; + struct qoriq_sensor *s = &qdata->sensor[id]; s->id = id; - s->qdata = qdata; tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id, s, &tmu_tz_ops);