From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754148Ab3LOE4q (ORCPT ); Sat, 14 Dec 2013 23:56:46 -0500 Received: from mail-yh0-f44.google.com ([209.85.213.44]:40976 "EHLO mail-yh0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754000Ab3LOE4p convert rfc822-to-8bit (ORCPT ); Sat, 14 Dec 2013 23:56:45 -0500 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Rashika Kheria , linux-kernel@vger.kernel.org From: Mike Turquette In-Reply-To: <20131214074606.GA20826@rashika> Cc: k.kozlowski@samsung.com, andy@groveronline.com, akpm@linux-foundation.org, torvalds@linux-foundation.org, kyungmin.park@samsung.com, broonie@linaro.org, sbkim73@samsung.com, linux-arm-kernel@lists.infradead.org References: <20131214074606.GA20826@rashika> Message-ID: <20131215045641.23538.82881@quantum> User-Agent: alot/0.3.5 Subject: Re: [PATCH] drivers: clk: Fix build break introduced in 3e1e4a5f Date: Sat, 14 Dec 2013 20:56:41 -0800 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting Rashika Kheria (2013-12-13 23:46:06) > This patch fixes the build break introduced by 3e1e4a5f. The mentioned > commit id makes the changes in file "include/linux/mfd/samsung/core.h" > by changing the members of structure sec_pmic_dev. > > The patch replaces "regmap" with "regmap_pmic" because structure > sec_pmic_dev no more contains any member named regmap. > > Thus, it removes the undefined reference to regmap in functions > s2mps11_clk_prepare(), s2mps11_clk_unprepare() and s2mps11_clk_probe(). > > Signed-off-by: Rashika Kheria Thanks for the fix. Taken into clk-next. Regards, Mike > --- > drivers/clk/clk-s2mps11.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c > index 7be41e6..94e3695 100644 > --- a/drivers/clk/clk-s2mps11.c > +++ b/drivers/clk/clk-s2mps11.c > @@ -60,7 +60,7 @@ static int s2mps11_clk_prepare(struct clk_hw *hw) > struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); > int ret; > > - ret = regmap_update_bits(s2mps11->iodev->regmap, > + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, > S2MPS11_REG_RTC_CTRL, > s2mps11->mask, s2mps11->mask); > if (!ret) > @@ -74,7 +74,8 @@ static void s2mps11_clk_unprepare(struct clk_hw *hw) > struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw); > int ret; > > - ret = regmap_update_bits(s2mps11->iodev->regmap, S2MPS11_REG_RTC_CTRL, > + ret = regmap_update_bits(s2mps11->iodev->regmap_pmic, > + S2MPS11_REG_RTC_CTRL, > s2mps11->mask, ~s2mps11->mask); > > if (!ret) > @@ -174,7 +175,7 @@ static int s2mps11_clk_probe(struct platform_device *pdev) > s2mps11_clk->hw.init = &s2mps11_clks_init[i]; > s2mps11_clk->mask = 1 << i; > > - ret = regmap_read(s2mps11_clk->iodev->regmap, > + ret = regmap_read(s2mps11_clk->iodev->regmap_pmic, > S2MPS11_REG_RTC_CTRL, &val); > if (ret < 0) > goto err_reg; > -- > 1.7.9.5 >