diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2014-03-14 19:20:58 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-03-14 14:26:29 -0400 |
| commit | 33081b34681742add8d8c1e49fc93045415e5a18 (patch) | |
| tree | d99e5f0f73f2714a575621ca0b16543bf481329a /drivers | |
| parent | d920203695029558ef16925182f89cf6302b50b0 (diff) | |
| download | blackbird-obmc-linux-33081b34681742add8d8c1e49fc93045415e5a18.tar.gz blackbird-obmc-linux-33081b34681742add8d8c1e49fc93045415e5a18.zip | |
ata: ahci_st: build fixes
* 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 <b.zolnierkie@samsung.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/Makefile | 2 | ||||
| -rw-r--r-- | drivers/ata/ahci_st.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile index 6bbd6dadef50..e20148c022b4 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -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_460ex.o 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 diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c index 17191b96648e..e1aa5447a400 100644 --- a/drivers/ata/ahci_st.c +++ b/drivers/ata/ahci_st.c @@ -87,7 +87,7 @@ static int st_ahci_deassert_resets(struct device *dev) 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 *dev) 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 *dev) 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); |
