From patchwork Fri Jun 5 18:42:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 49592 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AADE02462C for ; Fri, 5 Jun 2015 18:43:34 +0000 (UTC) Received: by wiam3 with SMTP id m3sf7123989wia.3 for ; Fri, 05 Jun 2015 11:43:34 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=In3nmiRyetAUP9wbnVjjtIzJnNO/kotx40ODaTSCa3o=; b=jb1YuCW2xrdi6ZHxchSU7eFk2brup6tbguxGV30bERANNtiQQSb8L660XB7A9E15Fp fCmRdEK2hOC0bA36LUJ3cv3eT8O9FSWasLNbTnYWKsIkgm9BUnPoSrw6ygjP7SHjxX7n JrB5FYWWc0SGWS9oNKFKbqaV2KsxiG5A+HcLCFkJtlnOHri2ONZj2TAozl5QH0r/k+s8 /+RmBHSdaMVBZP4FCR39+Eh5pqfC07rC8thYmDFY4trRlj1oRG4PXZ1TDnFxLvbP+Ge1 5q4rk3+dg1POUAtejFgGNGDd2N1KtQdZ4WKijQ2LFeOuB9318xTkNHv/W+sqXzKxVy8D AFEw== X-Gm-Message-State: ALoCoQkqXCctVjgl2qGKQmCvpmYozcgBrcItyxYBZJS6kuRcjB5B3fy7qz8Kjw5GxAiR1zNS5pMn X-Received: by 10.112.171.41 with SMTP id ar9mr4377495lbc.24.1433529813960; Fri, 05 Jun 2015 11:43:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.182.228 with SMTP id eh4ls384597lac.45.gmail; Fri, 05 Jun 2015 11:43:33 -0700 (PDT) X-Received: by 10.152.23.234 with SMTP id p10mr4663095laf.52.1433529813718; Fri, 05 Jun 2015 11:43:33 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id t11si5486645lbf.65.2015.06.05.11.43.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jun 2015 11:43:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by labpy14 with SMTP id py14so60399974lab.0 for ; Fri, 05 Jun 2015 11:43:33 -0700 (PDT) X-Received: by 10.152.29.34 with SMTP id g2mr4636873lah.73.1433529813415; Fri, 05 Jun 2015 11:43:33 -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.108.230 with SMTP id hn6csp70903lbb; Fri, 5 Jun 2015 11:43:32 -0700 (PDT) X-Received: by 10.68.69.39 with SMTP id b7mr8117534pbu.35.1433529811488; Fri, 05 Jun 2015 11:43:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bm1si11870432pbd.212.2015.06.05.11.43.30; Fri, 05 Jun 2015 11:43:31 -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; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755110AbbFESnM (ORCPT + 28 others); Fri, 5 Jun 2015 14:43:12 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:35663 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754844AbbFESnC (ORCPT ); Fri, 5 Jun 2015 14:43:02 -0400 Received: by wgme6 with SMTP id e6so63133658wgm.2 for ; Fri, 05 Jun 2015 11:43:01 -0700 (PDT) X-Received: by 10.194.176.201 with SMTP id ck9mr8799872wjc.108.1433529781182; Fri, 05 Jun 2015 11:43:01 -0700 (PDT) Received: from localhost.localdomain ([213.205.253.199]) by mx.google.com with ESMTPSA id be3sm4473541wib.21.2015.06.05.11.42.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Jun 2015 11:43:00 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, broonie@kernel.org, lgirdwood@gmail.com, Lee Jones Subject: [PATCH 2/8] regulator: pwm-regulator: Remove unnecessary descriptor attribute from ddata Date: Fri, 5 Jun 2015 19:42:45 +0100 Message-Id: <1433529771-24496-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1433529771-24496-1-git-send-email-lee.jones@linaro.org> References: <1433529771-24496-1-git-send-email-lee.jones@linaro.org> 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: lee.jones@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.53 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: , The Regulator Device keeps a full copy of it's own, which can be easily accessed. Signed-off-by: Lee Jones --- drivers/regulator/pwm-regulator.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index cf2a39b..4a071b6 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -21,7 +21,6 @@ #include struct pwm_regulator_data { - struct regulator_desc desc; struct pwm_voltages *duty_cycle_table; struct pwm_device *pwm; bool enabled; @@ -78,7 +77,7 @@ static int pwm_regulator_list_voltage(struct regulator_dev *dev, { struct pwm_regulator_data *drvdata = rdev_get_drvdata(dev); - if (selector >= drvdata->desc.n_voltages) + if (selector >= dev->desc->n_voltages) return -EINVAL; return drvdata->duty_cycle_table[selector].uV; @@ -91,7 +90,7 @@ static struct regulator_ops pwm_regulator_voltage_ops = { .map_voltage = regulator_map_voltage_iterate, }; -static const struct regulator_desc pwm_regulator_desc = { +static struct regulator_desc pwm_regulator_desc = { .name = "pwm-regulator", .ops = &pwm_regulator_voltage_ops, .type = REGULATOR_VOLTAGE, @@ -117,8 +116,6 @@ static int pwm_regulator_probe(struct platform_device *pdev) if (!drvdata) return -ENOMEM; - memcpy(&drvdata->desc, &pwm_regulator_desc, sizeof(pwm_regulator_desc)); - /* determine the number of voltage-table */ prop = of_find_property(np, "voltage-table", &length); if (!prop) { @@ -133,7 +130,7 @@ static int pwm_regulator_probe(struct platform_device *pdev) return -EINVAL; } - drvdata->desc.n_voltages = length / sizeof(*drvdata->duty_cycle_table); + pwm_regulator_desc.n_voltages = length / sizeof(*drvdata->duty_cycle_table); drvdata->duty_cycle_table = devm_kzalloc(&pdev->dev, length, GFP_KERNEL); @@ -150,7 +147,7 @@ static int pwm_regulator_probe(struct platform_device *pdev) } config.init_data = of_get_regulator_init_data(&pdev->dev, np, - &drvdata->desc); + &pwm_regulator_desc); if (!config.init_data) return -ENOMEM; @@ -165,10 +162,10 @@ static int pwm_regulator_probe(struct platform_device *pdev) } regulator = devm_regulator_register(&pdev->dev, - &drvdata->desc, &config); + &pwm_regulator_desc, &config); if (IS_ERR(regulator)) { dev_err(&pdev->dev, "Failed to register regulator %s\n", - drvdata->desc.name); + pwm_regulator_desc.name); return PTR_ERR(regulator); }