Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ata: ahci_st: build fixes

Browse source 
* 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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2014-03-14 19:20:58 +01:00 committed by Tejun Heo
parent d920203695
commit 33081b3468
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/ata/Makefile
View file

@ -5,7 +5,6 @@ obj-$(CONFIG_ATA) += libata.o
obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o obj-$(CONFIG_SATA_AHCI) += ahci.o libahci.o
obj-$(CONFIG_SATA_ACARD_AHCI) += acard-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_PLATFORM) += ahci_platform.o libahci.o
obj-$(CONFIG_SATA_AHCI_ST) += ahci_st.o
obj-$(CONFIG_SATA_FSL) += sata_fsl.o obj-$(CONFIG_SATA_FSL) += sata_fsl.o
obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o obj-$(CONFIG_SATA_INIC162X) += sata_inic162x.o
obj-$(CONFIG_SATA_SIL24) += sata_sil24.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_SATA_HIGHBANK) += sata_highbank.o libahci.o
obj-$(CONFIG_AHCI_IMX) += ahci_imx.o obj-$(CONFIG_AHCI_IMX) += ahci_imx.o
obj-$(CONFIG_AHCI_SUNXI) += ahci_sunxi.o obj-$(CONFIG_AHCI_SUNXI) += ahci_sunxi.o
obj-$(CONFIG_AHCI_ST) += ahci_st.o
# SFF w/ custom DMA # SFF w/ custom DMA
obj-$(CONFIG_PDC_ADMA) += pdc_adma.o obj-$(CONFIG_PDC_ADMA) += pdc_adma.o

12
drivers/ata/ahci_st.c
View file

@ -87,7 +87,7 @@ static int st_ahci_deassert_resets(struct device *dev)
return 0; 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 st_ahci_drv_data *drv_data = dev_get_drvdata(dev);
struct ahci_host_priv *hpriv = drv_data->hpriv; struct ahci_host_priv *hpriv = drv_data->hpriv;
@ -96,12 +96,10 @@ static int st_ahci_exit(struct device *dev)
if (drv_data->pwr) { if (drv_data->pwr) {
err = reset_control_assert(drv_data->pwr); err = reset_control_assert(drv_data->pwr);
if (err) if (err)
dev_err(&pdev->dev, "unable to pwrdwn\n"); dev_err(dev, "unable to pwrdwn\n");
} }
ahci_platform_disable_resources(hpriv); ahci_platform_disable_resources(hpriv);
return 0;
} }
static int st_ahci_probe_resets(struct platform_device *pdev) 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; struct ahci_host_priv *hpriv = drv_data->hpriv;
int err; int err;
ret = ahci_platform_suspend_host(dev); err = ahci_platform_suspend_host(dev);
if (ret) if (err)
return ret; return err;
if (drv_data->pwr) { if (drv_data->pwr) {
err = reset_control_assert(drv_data->pwr); err = reset_control_assert(drv_data->pwr);