From patchwork Fri Mar 14 18:20:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 3834521 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 8C8CA9F1CD for ; Fri, 14 Mar 2014 18:21:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 71AED201F9 for ; Fri, 14 Mar 2014 18:21:50 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 4F290201C0 for ; Fri, 14 Mar 2014 18:21:49 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOWjn-0004uj-QM; Fri, 14 Mar 2014 18:21:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOWjl-0004VH-83; Fri, 14 Mar 2014 18:21:41 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOWjg-0004U4-SR for linux-arm-kernel@lists.infradead.org; Fri, 14 Mar 2014 18:21:38 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N2F00B32UZDN670@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Sat, 15 Mar 2014 03:21:13 +0900 (KST) X-AuditID: cbfee61b-b7f456d000006dfd-e5-5323489805b0 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id AA.33.28157.89843235; Sat, 15 Mar 2014 03:21:13 +0900 (KST) Received: from amdc1032.localnet ([106.116.147.136]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N2F003OLUZBS330@mmp1.samsung.com>; Sat, 15 Mar 2014 03:21:12 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: Tejun Heo Subject: [PATCH 1/2] ata: ahci_st: build fixes Date: Fri, 14 Mar 2014 19:20:58 +0100 Message-id: <1848075.ERJNt1KrUa@amdc1032> User-Agent: KMail/4.8.4 (Linux/3.2.0-54-generic-pae; KDE/4.8.5; i686; ; ) MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrCLMWRmVeSWpSXmKPExsVy+t9jAd2ZHsrBBq/eMlnc/3qU0WLT42us Fsd2PGKyuLxrDpvFr+VHGR1YPTat6mTzuHNtD5vH5iX1Hp83yQWwRHHZpKTmZJalFunbJXBl zL5yhbHgkUhFz8qbjA2M2wW7GDk4JARMJP7Nt+pi5AQyxSQu3FvP1sXIxSEksIhR4u/d+VBO C5NE27J9bCBVbAJWEhPbVzGC2CICshJXpj1kBCliFmhllJi9Yio7SEJYQE+i+dUVFhCbRUBV Yl7zbbA4r4CmxPRDv8AGiQp4SuzYvpINIi4o8WPyPbB6ZgF5iX37p7JC2FoS63ceZ5rAyDcL SdksJGWzkJQtYGRexSiaWpBcUJyUnmukV5yYW1yal66XnJ+7iREcls+kdzCuarA4xCjAwajE w3tBSTlYiDWxrLgy9xCjBAezkgjvfmOgEG9KYmVValF+fFFpTmrxIUZpDhYlcd6DrdaBQgLp iSWp2ampBalFMFkmDk6pBsbqxBta945FL1m6bnZYm/vdIpZD1737775j+bQ9gfVOPe+EqKvT vt7c9Onl0QDXMI69EnWCVar7Q2ZNDpKb8HzDxAX2853mPSy13pV0dFXqI0PxNwdz1CMttvw2 WTFxQ153ZIVH6/con3ThSfrXjy7Yn3xoZuyOGRZv41ZW6IQWTn978Uror/qlSizFGYmGWsxF xYkAExAuOkcCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140314_142137_141214_CF77BE6A X-CRM114-Status: GOOD ( 11.53 ) X-Spam-Score: -6.9 (------) Cc: linux-ide@vger.kernel.org, Lee Jones , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 * The config option for ahci_st driver was renamed from CONFIG_SATA_AHCI_ST to CONFIG_AHCI_ST but Makefile was not updated. Fix it (also while at it move the ahci_st driver entry below ahci_imx and ahci_sunxi ones). * Fix a few build issues in the ahci_st driver itself. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ata/Makefile | 2 +- drivers/ata/ahci_st.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) Index: b/drivers/ata/Makefile =================================================================== --- a/drivers/ata/Makefile 2014-03-14 16:45:04.036724382 +0100 +++ b/drivers/ata/Makefile 2014-03-14 19:07:02.304579137 +0100 @@ -5,7 +5,6 @@ obj-$(CONFIG_ATA) += libata.o obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o obj-$(CONFIG_SATA_ACARD_AHCI) += acard-ahci.o libahci.o obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o -obj-$(CONFIG_SATA_AHCI_ST) += ahci_st.o obj-$(CONFIG_SATA_FSL) += sata_fsl.o obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o obj-$(CONFIG_SATA_SIL24) += sata_sil24.o @@ -13,6 +12,7 @@ obj-$(CONFIG_SATA_DWC) += sata_dwc_460e obj-$(CONFIG_SATA_HIGHBANK) += sata_highbank.o libahci.o obj-$(CONFIG_AHCI_IMX) += ahci_imx.o obj-$(CONFIG_AHCI_SUNXI) += ahci_sunxi.o +obj-$(CONFIG_AHCI_ST) += ahci_st.o # SFF w/ custom DMA obj-$(CONFIG_PDC_ADMA) += pdc_adma.o Index: b/drivers/ata/ahci_st.c =================================================================== --- a/drivers/ata/ahci_st.c 2014-03-14 19:03:11.368583073 +0100 +++ b/drivers/ata/ahci_st.c 2014-03-14 19:13:53.900572116 +0100 @@ -87,7 +87,7 @@ static int st_ahci_deassert_resets(struc return 0; } -static int st_ahci_exit(struct device *dev) +static void st_ahci_exit(struct device *dev) { struct st_ahci_drv_data *drv_data = dev_get_drvdata(dev); struct ahci_host_priv *hpriv = drv_data->hpriv; @@ -96,12 +96,10 @@ static int st_ahci_exit(struct device *d if (drv_data->pwr) { err = reset_control_assert(drv_data->pwr); if (err) - dev_err(&pdev->dev, "unable to pwrdwn\n"); + dev_err(dev, "unable to pwrdwn\n"); } ahci_platform_disable_resources(hpriv); - - return 0; } static int st_ahci_probe_resets(struct platform_device *pdev) @@ -186,9 +184,9 @@ static int st_ahci_suspend(struct device struct ahci_host_priv *hpriv = drv_data->hpriv; int err; - ret = ahci_platform_suspend_host(dev); - if (ret) - return ret; + err = ahci_platform_suspend_host(dev); + if (err) + return err; if (drv_data->pwr) { err = reset_control_assert(drv_data->pwr);