[PATCH 0/5] ahci: st: Apply Bartlomiej's suggestions

[PATCH 0/5] ahci: st: Apply Bartlomiej's suggestions

[Lee Jones]

Hi Tejun,

Sorry for the delay, I was in Asia for 9 days last week.

Here are the suggestions from Bartlomiej's review.

 drivers/ata/Kconfig   |  8 ++++----
 drivers/ata/ahci_st.c | 54 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 26 deletions(-)

[PATCH 0/5] ahci: st: Apply Bartlomiej's suggestions

[Lee Jones]

Hi Tejun,

Sorry for the delay, I was in Asia for 9 days last week.

Here are the suggestions from Bartlomiej's review.

 drivers/ata/Kconfig   |  8 ++++----
 drivers/ata/ahci_st.c | 54 ++++++++++++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 26 deletions(-)

[PATCH 1/5] ahci: st: Standardise naming conventions

[Lee Jones]

Other devices have adopted similar naming conventions which have been
accepted as the standard. This patch brings any mention of the the ST
AHCI driver into line with them.

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/Kconfig   | 6 +++---
 drivers/ata/ahci_st.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ee7a3dc..ffc5d9d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -97,12 +97,12 @@ config SATA_AHCI_PLATFORM
 
 	  If unsure, say N.
 
-config SATA_AHCI_ST
-	tristate "ST SATA support"
+config AHCI_ST
+	tristate "ST AHCI SATA support"
 	depends on SATA_AHCI_PLATFORM
 	select GENERIC_PHY
 	help
-	  This option enables support for ST SATA controller.
+	  This option enables support for ST AHCI SATA controller.
 
 	  If unsure, say N.
 
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 2f95133..f5af660 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -235,5 +235,5 @@ module_platform_driver(st_ahci_driver);
 
 MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue@st.com>");
 MODULE_AUTHOR("Francesco Virlinzi <francesco.virlinzi@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics Sata Ahci driver");
+MODULE_DESCRIPTION("STMicroelectronics SATA AHCI Driver");
 MODULE_LICENSE("GPL v2");
-- 
1.8.3.2

[PATCH 1/5] ahci: st: Standardise naming conventions

[Lee Jones]

Other devices have adopted similar naming conventions which have been
accepted as the standard. This patch brings any mention of the the ST
AHCI driver into line with them.

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/Kconfig   | 6 +++---
 drivers/ata/ahci_st.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ee7a3dc..ffc5d9d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -97,12 +97,12 @@ config SATA_AHCI_PLATFORM
 
 	  If unsure, say N.
 
-config SATA_AHCI_ST
-	tristate "ST SATA support"
+config AHCI_ST
+	tristate "ST AHCI SATA support"
 	depends on SATA_AHCI_PLATFORM
 	select GENERIC_PHY
 	help
-	  This option enables support for ST SATA controller.
+	  This option enables support for ST AHCI SATA controller.
 
 	  If unsure, say N.
 
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 2f95133..f5af660 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -235,5 +235,5 @@ module_platform_driver(st_ahci_driver);
 
 MODULE_AUTHOR("Alexandre Torgue <alexandre.torgue@st.com>");
 MODULE_AUTHOR("Francesco Virlinzi <francesco.virlinzi@st.com>");
-MODULE_DESCRIPTION("STMicroelectronics Sata Ahci driver");
+MODULE_DESCRIPTION("STMicroelectronics SATA AHCI Driver");
 MODULE_LICENSE("GPL v2");
-- 
1.8.3.2

[PATCH 2/5] ahci: st: Remove legacy dependencies on PHY

[Lee Jones]

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/Kconfig   | 1 -
 drivers/ata/ahci_st.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ffc5d9d..f1adb4b 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -100,7 +100,6 @@ config SATA_AHCI_PLATFORM
 config AHCI_ST
 	tristate "ST AHCI SATA support"
 	depends on SATA_AHCI_PLATFORM
-	select GENERIC_PHY
 	help
 	  This option enables support for ST AHCI SATA controller.
 
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index f5af660..a28532a 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -16,7 +16,6 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/ahci_platform.h>
-#include <linux/phy/phy.h>
 #include <linux/libata.h>
 #include <linux/reset.h>
 #include <linux/io.h>
@@ -33,7 +32,6 @@
 
 struct st_ahci_drv_data {
 	struct platform_device *ahci;
-	struct phy *phy;
 	struct reset_control *pwr;
 	struct reset_control *sw_rst;
 	struct reset_control *pwr_rst;
-- 
1.8.3.2

[PATCH 2/5] ahci: st: Remove legacy dependencies on PHY

[Lee Jones]

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/Kconfig   | 1 -
 drivers/ata/ahci_st.c | 2 --
 2 files changed, 3 deletions(-)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ffc5d9d..f1adb4b 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -100,7 +100,6 @@ config SATA_AHCI_PLATFORM
 config AHCI_ST
 	tristate "ST AHCI SATA support"
 	depends on SATA_AHCI_PLATFORM
-	select GENERIC_PHY
 	help
 	  This option enables support for ST AHCI SATA controller.
 
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index f5af660..a28532a 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -16,7 +16,6 @@
 #include <linux/clk.h>
 #include <linux/of.h>
 #include <linux/ahci_platform.h>
-#include <linux/phy/phy.h>
 #include <linux/libata.h>
 #include <linux/reset.h>
 #include <linux/io.h>
@@ -33,7 +32,6 @@
 
 struct st_ahci_drv_data {
 	struct platform_device *ahci;
-	struct phy *phy;
 	struct reset_control *pwr;
 	struct reset_control *sw_rst;
 	struct reset_control *pwr_rst;
-- 
1.8.3.2

[PATCH 3/5] ahci: st: Utilise ata_platform_remove_one() call

[Lee Jones]

ata_platform_remove_one() allows us to specify our own exit function
via platform data then goes off and removes ATA Host and Port in
preparation for device removal.

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/ahci_st.c | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index a28532a..3edec5d 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -87,6 +87,23 @@ static int st_ahci_deassert_resets(struct device *dev)
 	return 0;
 }
 
+static int 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;
+	int err;
+
+	if (drv_data->pwr) {
+		err = reset_control_assert(drv_data->pwr);
+		if (err)
+			dev_err(&pdev->dev, "unable to pwrdwn\n");
+	}
+
+	ahci_platform_disable_resources(hpriv);
+
+	return 0;
+}
+
 static int st_ahci_probe_resets(struct platform_device *pdev)
 {
 	struct st_ahci_drv_data *drv_data = platform_get_drvdata(pdev);
@@ -122,6 +139,7 @@ static const struct ata_port_info st_ahci_port_info = {
 static int st_ahci_probe(struct platform_device *pdev)
 {
 	struct st_ahci_drv_data *drv_data;
+	struct ahci_platform_data *pdata;
 	struct ahci_host_priv *hpriv;
 	int err;
 
@@ -131,6 +149,13 @@ static int st_ahci_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, drv_data);
 
+	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return -ENOMEM;
+
+	pdata->exit = st_ahci_exit;
+	pdev->dev.platform_data = pdata;
+
 	hpriv = ahci_platform_get_resources(pdev);
 	if (IS_ERR(hpriv))
 		return PTR_ERR(hpriv);
@@ -154,23 +179,6 @@ static int st_ahci_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int st_ahci_remove(struct platform_device *pdev)
-{
-	struct st_ahci_drv_data *drv_data = platform_get_drvdata(pdev);
-	struct ahci_host_priv *hpriv = drv_data->hpriv;
-	int err;
-
-	if (drv_data->pwr) {
-		err = reset_control_assert(drv_data->pwr);
-		if (err)
-			dev_err(&pdev->dev, "unable to pwrdwn\n");
-	}
-
-	ahci_platform_disable_resources(hpriv);
-
-	return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int st_ahci_suspend(struct device *dev)
 {
@@ -227,7 +235,7 @@ static struct platform_driver st_ahci_driver = {
 		.of_match_table = of_match_ptr(st_ahci_match),
 	},
 	.probe = st_ahci_probe,
-	.remove = st_ahci_remove,
+	.remove = ata_platform_remove_one,
 };
 module_platform_driver(st_ahci_driver);
 
-- 
1.8.3.2

[PATCH 3/5] ahci: st: Utilise ata_platform_remove_one() call

[Lee Jones]

ata_platform_remove_one() allows us to specify our own exit function
via platform data then goes off and removes ATA Host and Port in
preparation for device removal.

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/ahci_st.c | 44 ++++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index a28532a..3edec5d 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -87,6 +87,23 @@ static int st_ahci_deassert_resets(struct device *dev)
 	return 0;
 }
 
+static int 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;
+	int err;
+
+	if (drv_data->pwr) {
+		err = reset_control_assert(drv_data->pwr);
+		if (err)
+			dev_err(&pdev->dev, "unable to pwrdwn\n");
+	}
+
+	ahci_platform_disable_resources(hpriv);
+
+	return 0;
+}
+
 static int st_ahci_probe_resets(struct platform_device *pdev)
 {
 	struct st_ahci_drv_data *drv_data = platform_get_drvdata(pdev);
@@ -122,6 +139,7 @@ static const struct ata_port_info st_ahci_port_info = {
 static int st_ahci_probe(struct platform_device *pdev)
 {
 	struct st_ahci_drv_data *drv_data;
+	struct ahci_platform_data *pdata;
 	struct ahci_host_priv *hpriv;
 	int err;
 
@@ -131,6 +149,13 @@ static int st_ahci_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, drv_data);
 
+	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return -ENOMEM;
+
+	pdata->exit = st_ahci_exit;
+	pdev->dev.platform_data = pdata;
+
 	hpriv = ahci_platform_get_resources(pdev);
 	if (IS_ERR(hpriv))
 		return PTR_ERR(hpriv);
@@ -154,23 +179,6 @@ static int st_ahci_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int st_ahci_remove(struct platform_device *pdev)
-{
-	struct st_ahci_drv_data *drv_data = platform_get_drvdata(pdev);
-	struct ahci_host_priv *hpriv = drv_data->hpriv;
-	int err;
-
-	if (drv_data->pwr) {
-		err = reset_control_assert(drv_data->pwr);
-		if (err)
-			dev_err(&pdev->dev, "unable to pwrdwn\n");
-	}
-
-	ahci_platform_disable_resources(hpriv);
-
-	return 0;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int st_ahci_suspend(struct device *dev)
 {
@@ -227,7 +235,7 @@ static struct platform_driver st_ahci_driver = {
 		.of_match_table = of_match_ptr(st_ahci_match),
 	},
 	.probe = st_ahci_probe,
-	.remove = st_ahci_remove,
+	.remove = ata_platform_remove_one,
 };
 module_platform_driver(st_ahci_driver);
 
-- 
1.8.3.2

[PATCH 4/5] ahci: st: Only build for ST-Micro h/w

[Lee Jones]

This device is designed specifically to run on ST-Microelectronics'
hardware. To ensure no attempts are made to run on anything incompatible
we add a dependency on ST architecture

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index f1adb4b..9b4feb7 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -100,6 +100,7 @@ config SATA_AHCI_PLATFORM
 config AHCI_ST
 	tristate "ST AHCI SATA support"
 	depends on SATA_AHCI_PLATFORM
+	depends on ARCH_STI
 	help
 	  This option enables support for ST AHCI SATA controller.
 
-- 
1.8.3.2

[PATCH 4/5] ahci: st: Only build for ST-Micro h/w

[Lee Jones]

This device is designed specifically to run on ST-Microelectronics'
hardware. To ensure no attempts are made to run on anything incompatible
we add a dependency on ST architecture

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index f1adb4b..9b4feb7 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -100,6 +100,7 @@ config SATA_AHCI_PLATFORM
 config AHCI_ST
 	tristate "ST AHCI SATA support"
 	depends on SATA_AHCI_PLATFORM
+	depends on ARCH_STI
 	help
 	  This option enables support for ST AHCI SATA controller.
 
-- 
1.8.3.2

[PATCH 5/5] ahci: st: Invoke AHCI Platform Suspend/Resume

[Lee Jones]

This is where we disable IRQs on suspend and update the internal
power state during suspend/resume.

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/ahci_st.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 3edec5d..17191b9 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -186,6 +186,10 @@ 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;
+
 	if (drv_data->pwr) {
 		err = reset_control_assert(drv_data->pwr);
 		if (err) {
@@ -215,7 +219,7 @@ static int st_ahci_resume(struct device *dev)
 		return err;
 	}
 
-	return 0;
+	return ahci_platform_resume_host(dev);
 }
 #endif
 
-- 
1.8.3.2

[PATCH 5/5] ahci: st: Invoke AHCI Platform Suspend/Resume

[Lee Jones]

This is where we disable IRQs on suspend and update the internal
power state during suspend/resume.

Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/ata/ahci_st.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 3edec5d..17191b9 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -186,6 +186,10 @@ 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;
+
 	if (drv_data->pwr) {
 		err = reset_control_assert(drv_data->pwr);
 		if (err) {
@@ -215,7 +219,7 @@ static int st_ahci_resume(struct device *dev)
 		return err;
 	}
 
-	return 0;
+	return ahci_platform_resume_host(dev);
 }
 #endif
 
-- 
1.8.3.2

Re: [PATCH 0/5] ahci: st: Apply Bartlomiej's suggestions

[Tejun Heo]

On Wed, Mar 12, 2014 at 12:39:37PM +0000, Lee Jones wrote:
> Hi Tejun,
> 
> Sorry for the delay, I was in Asia for 9 days last week.
> 
> Here are the suggestions from Bartlomiej's review.

Applied 1-5 to libata/for-3.15.

Thanks.

-- 
tejun

Re: [PATCH 0/5] ahci: st: Apply Bartlomiej's suggestions

[Tejun Heo]

On Wed, Mar 12, 2014 at 12:39:37PM +0000, Lee Jones wrote:
> Hi Tejun,
> 
> Sorry for the delay, I was in Asia for 9 days last week.
> 
> Here are the suggestions from Bartlomiej's review.

Applied 1-5 to libata/for-3.15.

Thanks.

-- 
tejun

[PATCH 0/5] ahci: st: Apply Bartlomiej's suggestions

[Tejun Heo]

On Wed, Mar 12, 2014 at 12:39:37PM +0000, Lee Jones wrote:
> Hi Tejun,
> 
> Sorry for the delay, I was in Asia for 9 days last week.
> 
> Here are the suggestions from Bartlomiej's review.

Applied 1-5 to libata/for-3.15.

Thanks.

-- 
tejun