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: 37148 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4ED7520491 for ; Tue, 9 Sep 2014 19:12:37 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id va2sf84618483obc.11 for ; Tue, 09 Sep 2014 12:12:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:in-reply-to:cc :references:message-id:user-agent:subject:date:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=sBvrZRJ17hXe/F8taj9raP9Bd2XGCvDhK8gcniyOPjc=; b=l+PoL9gweE0DrQ+U/Gu5SMrcpDDIORVxGn58dvA768l1mfctZbiSiPRlYR8/4i4TxK VEutIZOmqWKr0t4hc5wGxs8MLMa2P8XStFgGFjSxb2pHE9hqbAX+EYuO3xz5cR2GSPPS IIzs/xiFUs4f9wtJZyQTVpy+B81NO1yd+c5pTn381WPmrQE9UaafEd4P7E1Ugiv0kR9r /3+b7lYukPCEr+9pS4iUYoqZqgoqzexZV8Is/sZNrVywYpJlMVJc68WBGMmyQ3oSXjGv UTyVLHWLW+fEmGzAeRaFs2Hh6uvDvItqH5sm2DgwU+Bfv6KXkRigra16xW/bRcgNwpT7 sEqA== X-Gm-Message-State: ALoCoQmHjdgMWJguHgXDS7yVwJB6dL/M0sY5cV5yIgZKa+fkeOV277NH+SCeFVTcCeesvY2U83WM X-Received: by 10.42.209.200 with SMTP id gh8mr8285615icb.2.1410289956742; Tue, 09 Sep 2014 12:12:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.47 with SMTP id k44ls2239205qgd.73.gmail; Tue, 09 Sep 2014 12:12:36 -0700 (PDT) X-Received: by 10.52.106.168 with SMTP id gv8mr1969140vdb.80.1410289956595; Tue, 09 Sep 2014 12:12:36 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id wb9si5508845vcb.88.2014.09.09.12.12.36 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 12:12:36 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so3823345vcb.31 for ; Tue, 09 Sep 2014 12:12:36 -0700 (PDT) X-Received: by 10.52.249.66 with SMTP id ys2mr13824804vdc.41.1410289956527; Tue, 09 Sep 2014 12:12:36 -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.221.45.67 with SMTP id uj3csp330727vcb; Tue, 9 Sep 2014 12:12:35 -0700 (PDT) X-Received: by 10.68.170.194 with SMTP id ao2mr32938157pbc.28.1410289954326; Tue, 09 Sep 2014 12:12:34 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rl7si24538827pab.218.2014.09.09.12.12.33 for ; Tue, 09 Sep 2014 12:12:34 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752359AbaIITMZ (ORCPT + 27 others); Tue, 9 Sep 2014 15:12:25 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:33165 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751734AbaIITMV convert rfc822-to-8bit (ORCPT ); Tue, 9 Sep 2014 15:12:21 -0400 Received: by mail-pd0-f173.google.com with SMTP id ft15so7600293pdb.32 for ; Tue, 09 Sep 2014 12:12:21 -0700 (PDT) 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> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, shawn.guo@freescale.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 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: mturquette@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.220.172 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: , 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 --- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ --- 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; };