From patchwork Tue Sep 9 19:12:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Turquette X-Patchwork-Id: 4872541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5A13C9F32F for ; Tue, 9 Sep 2014 19:14:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70A332017A for ; Tue, 9 Sep 2014 19:14:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D73B20123 for ; Tue, 9 Sep 2014 19:14:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XRQqL-0005jg-Ko; Tue, 09 Sep 2014 19:12:45 +0000 Received: from mail-pa0-f49.google.com ([209.85.220.49]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XRQqI-0005cN-9a for linux-arm-kernel@lists.infradead.org; Tue, 09 Sep 2014 19:12:43 +0000 Received: by mail-pa0-f49.google.com with SMTP id lf10so4096675pab.36 for ; Tue, 09 Sep 2014 12:12:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version :content-transfer-encoding:to:from:in-reply-to:cc:references :message-id:user-agent:subject:date; bh=GwJcV+aSGZYhzxkpDpmXBfCk28j0qry+LHTVQstFxI8=; b=UNBi+hSRXzncm3UQbb3xBVphYOQxTnWxqg2X1a9PU1hS6L2rr/l5pe5byvyICSFYbP /5mfMGG8tTpLPzQ3tuTci3s7/aU53wT7z+S/8PU4KHnKNPeCbmrlm1e6tmWicbPgoDm/ m6zzVNeVGC2055oN6xbTmzCSJ6/8OfRicp9rK9KHrfP/W/gIsNp+U3yjVbkiaC3Nlpf7 IIPAODmMX748qofqqr75n4pSHJCqGUIxmo9hNlFex+1cGl3gzJfxJlhIQzapuQ2cftex K90GWgylDsZ6JgBZ9EDPG4OA0sVvQQnaHsypwMVkEW8YMFTXdAT1frvEBeziRmtnJzMb DwLA== X-Gm-Message-State: ALoCoQkYk/ib3Mw1L+vsWZDAYpOfGoVOSvaBrMiJNazIG4jB7oR/M4xdqih0EilZjP61Jqc05xjX X-Received: by 10.68.57.142 with SMTP id i14mr20288953pbq.64.1410289941005; Tue, 09 Sep 2014 12:12:21 -0700 (PDT) Received: from localhost (pool-108-47-66-231.lsanca.fios.verizon.net. [108.47.66.231]) by mx.google.com with ESMTPSA id cu3sm12320546pbb.48.2014.09.09.12.12.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 09 Sep 2014 12:12:19 -0700 (PDT) MIME-Version: 1.0 To: Tomeu Vizoso From: Mike Turquette In-Reply-To: <1410271497-27148-1-git-send-email-tomeu.vizoso@collabora.com> References: <1410271329-26637-1-git-send-email-tomeu.vizoso@collabora.com> <1410271497-27148-1-git-send-email-tomeu.vizoso@collabora.com> Message-ID: <20140909191205.19023.61366@quantum> User-Agent: alot/0.3.5 Subject: Re: [PATCH v10 2/9] clk: Move all drivers to use internal API Date: Tue, 09 Sep 2014 12:12:05 -0700 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140909_121242_360234_0446623F X-CRM114-Status: GOOD ( 22.49 ) X-Spam-Score: -0.7 (/) Cc: shawn.guo@freescale.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Quoting Tomeu Vizoso (2014-09-09 07:04:57) > In preparation to change the public API to return a per-user clk structure, > remove any usage of this public API from the clock implementations. > > The reason for having this in a separate commit from the one that introduces > the implementation of the new functions is to separate the changes generated > with Coccinelle from the rest, and keep the patches' size reasonable. > > Signed-off-by: Tomeu Vizoso > Tested-by: Boris Brezillon > Tested-by: Heiko Stuebner > Acked-by: Boris Brezillon > > --- > > v10: * Add a few more files to be converted > * Re-generate the patch on top of the latest changes Hi Tomeu, Generating this on top of linux-next is a no-go. I can't apply it to my tree. The best thing is to generate it on top of -rc4, and that is what I will merge. Running the script against linux-next is still very useful and lets us patch up the stuff that is not going through the clk tree. E.g. the LPSS driver is already in mainline, so just running the semantic patch against -rc4 is sufficient for it. However a patch like Shawn's "ARM: imx: add an exclusive gate clock type" came in through the i.MX tree and we'll need to patch it after the fact. The best way to do that is for me to host a branch with just your changes in it that everyone can pull in as a dependency with the same commit ids. > diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c > index bcbdbd2..f4c6ccf 100644 > --- a/drivers/acpi/acpi_lpss.c > +++ b/drivers/acpi/acpi_lpss.c > @@ -11,7 +11,6 @@ > */ > > #include > -#include > #include > #include > #include > @@ -78,7 +77,7 @@ struct lpss_private_data { > void __iomem *mmio_base; > resource_size_t mmio_size; > unsigned int fixed_clk_rate; > - struct clk *clk; > + struct clk_core *clk; > const struct lpss_device_desc *dev_desc; > u32 prv_reg_ctx[LPSS_PRV_REG_COUNT]; > }; > @@ -229,7 +228,7 @@ static int register_device_clock(struct acpi_device *adev, > { > const struct lpss_device_desc *dev_desc = pdata->dev_desc; > const char *devname = dev_name(&adev->dev); > - struct clk *clk = ERR_PTR(-ENODEV); > + struct clk_core *clk = ERR_PTR(-ENODEV); > struct lpss_clk_data *clk_data; > const char *parent, *clk_name; > void __iomem *prv_base; I think the following hunk is missing from your change: Otherwise register_device_clock will blow up because we are assigning a struct clk * to a struct clk_core *. Do you mind testing with ARCH=x86_64 and allmodconfig? That will help catch issues like this. Regards, Mike --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -57,7 +57,7 @@ ACPI_MODULE_NAME("acpi_lpss"); struct lpss_shared_clock { const char *name; unsigned long rate; - struct clk *clk; + struct clk_core *clk; };