* [PATCH] ata: remove deprecated struct ahci_platform_data
@ 2014-08-12 16:22 Bartlomiej Zolnierkiewicz
2014-08-12 19:17 ` Hans de Goede
2014-08-16 12:36 ` Tejun Heo
0 siblings, 2 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-08-12 16:22 UTC (permalink / raw)
To: Tejun Heo; +Cc: Hans de Goede, linux-ide, linux-kernel
The last user of the deprecated struct ahci_platform_data has been
cleaned up recently (SPEAr1340 got a proper PHY driver).
Cc: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
drivers/ata/ahci_platform.c | 18 +-----------------
drivers/ata/libahci_platform.c | 23 -----------------------
include/linux/ahci_platform.h | 13 -------------
3 files changed, 1 insertion(+), 53 deletions(-)
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index f61ddb9..06f1d59 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -32,7 +32,6 @@ static const struct ata_port_info ahci_port_info = {
static int ahci_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
- struct ahci_platform_data *pdata = dev_get_platdata(dev);
struct ahci_host_priv *hpriv;
int rc;
@@ -44,29 +43,14 @@ static int ahci_probe(struct platform_device *pdev)
if (rc)
return rc;
- /*
- * Some platforms might need to prepare for mmio region access,
- * which could be done in the following init call. So, the mmio
- * region shouldn't be accessed before init (if provided) has
- * returned successfully.
- */
- if (pdata && pdata->init) {
- rc = pdata->init(dev, hpriv->mmio);
- if (rc)
- goto disable_resources;
- }
-
if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info);
if (rc)
- goto pdata_exit;
+ goto disable_resources;
return 0;
-pdata_exit:
- if (pdata && pdata->exit)
- pdata->exit(dev);
disable_resources:
ahci_platform_disable_resources(hpriv);
return rc;
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index 5b92c29..c0510de 100644
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -502,13 +502,8 @@ EXPORT_SYMBOL_GPL(ahci_platform_init_host);
static void ahci_host_stop(struct ata_host *host)
{
- struct device *dev = host->dev;
- struct ahci_platform_data *pdata = dev_get_platdata(dev);
struct ahci_host_priv *hpriv = host->private_data;
- if (pdata && pdata->exit)
- pdata->exit(dev);
-
ahci_platform_disable_resources(hpriv);
}
@@ -592,7 +587,6 @@ EXPORT_SYMBOL_GPL(ahci_platform_resume_host);
*/
int ahci_platform_suspend(struct device *dev)
{
- struct ahci_platform_data *pdata = dev_get_platdata(dev);
struct ata_host *host = dev_get_drvdata(dev);
struct ahci_host_priv *hpriv = host->private_data;
int rc;
@@ -601,19 +595,9 @@ int ahci_platform_suspend(struct device *dev)
if (rc)
return rc;
- if (pdata && pdata->suspend) {
- rc = pdata->suspend(dev);
- if (rc)
- goto resume_host;
- }
-
ahci_platform_disable_resources(hpriv);
return 0;
-
-resume_host:
- ahci_platform_resume_host(dev);
- return rc;
}
EXPORT_SYMBOL_GPL(ahci_platform_suspend);
@@ -629,7 +613,6 @@ EXPORT_SYMBOL_GPL(ahci_platform_suspend);
*/
int ahci_platform_resume(struct device *dev)
{
- struct ahci_platform_data *pdata = dev_get_platdata(dev);
struct ata_host *host = dev_get_drvdata(dev);
struct ahci_host_priv *hpriv = host->private_data;
int rc;
@@ -638,12 +621,6 @@ int ahci_platform_resume(struct device *dev)
if (rc)
return rc;
- if (pdata && pdata->resume) {
- rc = pdata->resume(dev);
- if (rc)
- goto disable_resources;
- }
-
rc = ahci_platform_resume_host(dev);
if (rc)
goto disable_resources;
diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
index 09a947e..642d6ae 100644
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
@@ -22,19 +22,6 @@ struct ata_port_info;
struct ahci_host_priv;
struct platform_device;
-/*
- * Note ahci_platform_data is deprecated, it is only kept around for use
- * by the old da850 and spear13xx ahci code.
- * New drivers should instead declare their own platform_driver struct, and
- * use ahci_platform* functions in their own probe, suspend and resume methods.
- */
-struct ahci_platform_data {
- int (*init)(struct device *dev, void __iomem *addr);
- void (*exit)(struct device *dev);
- int (*suspend)(struct device *dev);
- int (*resume)(struct device *dev);
-};
-
int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
--
1.8.2.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ata: remove deprecated struct ahci_platform_data
2014-08-12 16:22 [PATCH] ata: remove deprecated struct ahci_platform_data Bartlomiej Zolnierkiewicz
@ 2014-08-12 19:17 ` Hans de Goede
2014-08-16 12:36 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2014-08-12 19:17 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz, Tejun Heo; +Cc: linux-ide, linux-kernel
Hi,
On 08/12/2014 06:22 PM, Bartlomiej Zolnierkiewicz wrote:
> The last user of the deprecated struct ahci_platform_data has been
> cleaned up recently (SPEAr1340 got a proper PHY driver).
>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Many thanks for making this happen:
Acked-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> ---
> drivers/ata/ahci_platform.c | 18 +-----------------
> drivers/ata/libahci_platform.c | 23 -----------------------
> include/linux/ahci_platform.h | 13 -------------
> 3 files changed, 1 insertion(+), 53 deletions(-)
>
> diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
> index f61ddb9..06f1d59 100644
> --- a/drivers/ata/ahci_platform.c
> +++ b/drivers/ata/ahci_platform.c
> @@ -32,7 +32,6 @@ static const struct ata_port_info ahci_port_info = {
> static int ahci_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> - struct ahci_platform_data *pdata = dev_get_platdata(dev);
> struct ahci_host_priv *hpriv;
> int rc;
>
> @@ -44,29 +43,14 @@ static int ahci_probe(struct platform_device *pdev)
> if (rc)
> return rc;
>
> - /*
> - * Some platforms might need to prepare for mmio region access,
> - * which could be done in the following init call. So, the mmio
> - * region shouldn't be accessed before init (if provided) has
> - * returned successfully.
> - */
> - if (pdata && pdata->init) {
> - rc = pdata->init(dev, hpriv->mmio);
> - if (rc)
> - goto disable_resources;
> - }
> -
> if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
> hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
>
> rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info);
> if (rc)
> - goto pdata_exit;
> + goto disable_resources;
>
> return 0;
> -pdata_exit:
> - if (pdata && pdata->exit)
> - pdata->exit(dev);
> disable_resources:
> ahci_platform_disable_resources(hpriv);
> return rc;
> diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
> index 5b92c29..c0510de 100644
> --- a/drivers/ata/libahci_platform.c
> +++ b/drivers/ata/libahci_platform.c
> @@ -502,13 +502,8 @@ EXPORT_SYMBOL_GPL(ahci_platform_init_host);
>
> static void ahci_host_stop(struct ata_host *host)
> {
> - struct device *dev = host->dev;
> - struct ahci_platform_data *pdata = dev_get_platdata(dev);
> struct ahci_host_priv *hpriv = host->private_data;
>
> - if (pdata && pdata->exit)
> - pdata->exit(dev);
> -
> ahci_platform_disable_resources(hpriv);
> }
>
> @@ -592,7 +587,6 @@ EXPORT_SYMBOL_GPL(ahci_platform_resume_host);
> */
> int ahci_platform_suspend(struct device *dev)
> {
> - struct ahci_platform_data *pdata = dev_get_platdata(dev);
> struct ata_host *host = dev_get_drvdata(dev);
> struct ahci_host_priv *hpriv = host->private_data;
> int rc;
> @@ -601,19 +595,9 @@ int ahci_platform_suspend(struct device *dev)
> if (rc)
> return rc;
>
> - if (pdata && pdata->suspend) {
> - rc = pdata->suspend(dev);
> - if (rc)
> - goto resume_host;
> - }
> -
> ahci_platform_disable_resources(hpriv);
>
> return 0;
> -
> -resume_host:
> - ahci_platform_resume_host(dev);
> - return rc;
> }
> EXPORT_SYMBOL_GPL(ahci_platform_suspend);
>
> @@ -629,7 +613,6 @@ EXPORT_SYMBOL_GPL(ahci_platform_suspend);
> */
> int ahci_platform_resume(struct device *dev)
> {
> - struct ahci_platform_data *pdata = dev_get_platdata(dev);
> struct ata_host *host = dev_get_drvdata(dev);
> struct ahci_host_priv *hpriv = host->private_data;
> int rc;
> @@ -638,12 +621,6 @@ int ahci_platform_resume(struct device *dev)
> if (rc)
> return rc;
>
> - if (pdata && pdata->resume) {
> - rc = pdata->resume(dev);
> - if (rc)
> - goto disable_resources;
> - }
> -
> rc = ahci_platform_resume_host(dev);
> if (rc)
> goto disable_resources;
> diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h
> index 09a947e..642d6ae 100644
> --- a/include/linux/ahci_platform.h
> +++ b/include/linux/ahci_platform.h
> @@ -22,19 +22,6 @@ struct ata_port_info;
> struct ahci_host_priv;
> struct platform_device;
>
> -/*
> - * Note ahci_platform_data is deprecated, it is only kept around for use
> - * by the old da850 and spear13xx ahci code.
> - * New drivers should instead declare their own platform_driver struct, and
> - * use ahci_platform* functions in their own probe, suspend and resume methods.
> - */
> -struct ahci_platform_data {
> - int (*init)(struct device *dev, void __iomem *addr);
> - void (*exit)(struct device *dev);
> - int (*suspend)(struct device *dev);
> - int (*resume)(struct device *dev);
> -};
> -
> int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
> void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
> int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ata: remove deprecated struct ahci_platform_data
2014-08-12 16:22 [PATCH] ata: remove deprecated struct ahci_platform_data Bartlomiej Zolnierkiewicz
2014-08-12 19:17 ` Hans de Goede
@ 2014-08-16 12:36 ` Tejun Heo
1 sibling, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2014-08-16 12:36 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz; +Cc: Hans de Goede, linux-ide, linux-kernel
On Tue, Aug 12, 2014 at 06:22:27PM +0200, Bartlomiej Zolnierkiewicz wrote:
> The last user of the deprecated struct ahci_platform_data has been
> cleaned up recently (SPEAr1340 got a proper PHY driver).
>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Applied to libata/for-3.18.
Thanks!
--
tejun
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-08-16 12:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-12 16:22 [PATCH] ata: remove deprecated struct ahci_platform_data Bartlomiej Zolnierkiewicz
2014-08-12 19:17 ` Hans de Goede
2014-08-16 12:36 ` Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox