From patchwork Tue Aug 26 14:18:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zhong X-Patchwork-Id: 383082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-pd0-x23f.google.com (mail-pd0-x23f.google.com [IPv6:2607:f8b0:400e:c02::23f]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BB8B014007B for ; Wed, 27 Aug 2014 00:19:48 +1000 (EST) Received: by mail-pd0-f191.google.com with SMTP id y10sf3444617pdj.28 for ; Tue, 26 Aug 2014 07:19:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:list-post:list-help:list-archive:sender:list-subscribe :list-unsubscribe:content-type; bh=gKvR/tj/KZhY7J1NPwkcTJK2xzrA43rAXG5Z6jl3MKY=; b=d09gIWY2nUwtvFf4J07sbL/IkXUY6A0jc2+WeXOlB4EyFFbVRJg9u4zCDggQodExB3 1wIArtSud85n6Kq3CXyAVq/rKLpBk1pPIe+mH0AvZgsd3ptE+QkxLfDPaYr/0AKP1bGo ndSM/VMmhhWaplOxPYKdDZ5bOz5+jT23KnGSEdEeTgS3qce7VxjFFj/3pg6fwIqCYJxI 3RmClw9scPCDwD5lQAzIvhdn2/8Mi4ZbvWQS35FvepOnVoMJZ70WGGG1yf5cE4esIhtb JtypbqOK+JzRSNR1mJd7oSX/HaPqOJpzerdU8le1dxxo6x/zeTosREFyV8NBuqK0JM1D K2cw== X-Received: by 10.183.1.34 with SMTP id bd2mr170988obd.6.1409062785576; Tue, 26 Aug 2014 07:19:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.182.133.105 with SMTP id pb9ls819149obb.57.gmail; Tue, 26 Aug 2014 07:19:45 -0700 (PDT) X-Received: by 10.182.213.105 with SMTP id nr9mr18718976obc.36.1409062785150; Tue, 26 Aug 2014 07:19:45 -0700 (PDT) Received: from regular1.263xmail.com (regular1.263xmail.com. [211.150.99.133]) by gmr-mx.google.com with ESMTPS id pz1si399172pbb.0.2014.08.26.07.19.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 26 Aug 2014 07:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of zyw@rock-chips.com designates 211.150.99.133 as permitted sender) client-ip=211.150.99.133; Received: from zyw?rock-chips.com (unknown [192.168.167.190]) by regular1.263xmail.com (Postfix) with SMTP id C86687105; Tue, 26 Aug 2014 22:19:37 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ABS-CHECKED: 4 X-KSVirus-check: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 6629329880; Tue, 26 Aug 2014 22:19:02 +0800 (CST) X-RL-SENDER: zyw@rock-chips.com X-FST-TO: robh+dt@kernel.org X-SENDER-IP: 127.0.0.1 X-LOGIN-NAME: zyw@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: zyw@rock-chips.com X-DNS-TYPE: 1 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.263.net (Postfix) whith ESMTP id 140018W4L0B; Tue, 26 Aug 2014 22:19:01 +0800 (CST) From: Chris Zhong To: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, sameo@linux.intel.com, lee.jones@linaro.org, lgirdwood@gmail.com, broonie@kernel.org, a.zummo@towertech.it, mturquette@linaro.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, rtc-linux@googlegroups.com, grant.likely@linaro.org, hl@rock-chips.com, huangtao@rock-chips.com, cf@rock-chips.com, zhangqing@rock-chips.com, xxx@rock-chips.com, dianders@chromium.org, heiko@sntech.de, olof@lixom.net, sonnyrao@chromium.org, dtor@chromium.org, javier.martinez@collabora.co.uk, kever.yang@rock-chips.com, Chris Zhong Subject: [rtc-linux] [PATCH v6 5/5] regulator: RK808: remove redundant code Date: Tue, 26 Aug 2014 22:18:57 +0800 Message-Id: <1409062737-12259-1-git-send-email-zyw@rock-chips.com> X-Mailer: git-send-email 1.7.9.5 X-Original-Sender: zyw@rock-chips.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of zyw@rock-chips.com designates 211.150.99.133 as permitted sender) smtp.mail=zyw@rock-chips.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , remove the redundant code, since pdata has been removed from stuct rk808 Signed-off-by: Chris Zhong --- Changes in v6: - remove the redundant code Changes in v5: - re-edit base on Mark's branch Changes in v4: - use &client->dev replace rk808->dev Changes in v3: None Changes in v2: Adviced by Mark Browm: - change of_find_node_by_name to find_child_by_name - use RK808_NUM_REGULATORS as the name of the constant - create a pdata when missing platform data - use the rk808_reg name to supply_regulator name - replace regulator_register with devm_regulator_register - some other problem with coding styl drivers/regulator/rk808-regulator.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index f00d6d8..f42952e 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -294,11 +294,10 @@ static struct of_regulator_match rk808_reg_matches[] = { [RK808_ID_SWITCH2] = { .name = "SWITCH_REG2" }, }; -static int rk808_regulator_dts(struct rk808 *rk808) +static int rk808_regulator_dts(struct i2c_client *client, + struct rk808_board *pdata) { struct device_node *np, *reg_np; - struct i2c_client *client = rk808->i2c; - struct rk808_board *pdata = rk808->pdata; int i, ret; np = client->dev.of_node; @@ -335,7 +334,7 @@ static int rk808_regulator_probe(struct platform_device *pdev) { struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent); struct i2c_client *client = rk808->i2c; - struct rk808_board *pdata = rk808->pdata; + struct rk808_board *pdata = dev_get_platdata(&client->dev); struct regulator_config config = {}; struct regulator_dev *rk808_rdev; struct regulator_init_data *reg_data; @@ -343,22 +342,15 @@ static int rk808_regulator_probe(struct platform_device *pdev) int ret = 0; if (!pdata) { - dev_warn(&client->dev, "%s no pdata, create it\n", __func__); pdata = devm_kzalloc(&client->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; } - ret = rk808_regulator_dts(rk808); + ret = rk808_regulator_dts(client, pdata); if (ret) return ret; - rk808->num_regulators = RK808_NUM_REGULATORS; - rk808->rdev = devm_kzalloc(&pdev->dev, RK808_NUM_REGULATORS * - sizeof(struct regulator_dev *), GFP_KERNEL); - if (!rk808->rdev) - return -ENOMEM; - /* Instantiate the regulators */ for (i = 0; i < RK808_NUM_REGULATORS; i++) { reg_data = pdata->rk808_init_data[i]; @@ -382,7 +374,6 @@ static int rk808_regulator_probe(struct platform_device *pdev) "failed to register %d regulator\n", i); return PTR_ERR(rk808_rdev); } - rk808->rdev[i] = rk808_rdev; } return 0; }