Commit 16af2d65 authored by Kunihiko Hayashi's avatar Kunihiko Hayashi Committed by Tejun Heo

ata: add an extra argument to ahci_platform_get_resources()

Add an extra argument to ahci_platform_get_resources(), that is
for the bitmap representing the resource to get in this function.

Currently there is no resources to be defined, so all the callers set
'0' to the argument.
Suggested-by: default avatarHans de Goede <hdegoede@redhat.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Patrice Chotard <patrice.chotard@st.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent a69508c2
...@@ -425,7 +425,7 @@ static int brcm_ahci_probe(struct platform_device *pdev) ...@@ -425,7 +425,7 @@ static int brcm_ahci_probe(struct platform_device *pdev)
brcm_sata_phys_enable(priv); brcm_sata_phys_enable(priv);
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
hpriv->plat_data = priv; hpriv->plat_data = priv;
......
...@@ -213,7 +213,7 @@ static int ceva_ahci_probe(struct platform_device *pdev) ...@@ -213,7 +213,7 @@ static int ceva_ahci_probe(struct platform_device *pdev)
cevapriv->ahci_pdev = pdev; cevapriv->ahci_pdev = pdev;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -171,7 +171,7 @@ static int ahci_da850_probe(struct platform_device *pdev) ...@@ -171,7 +171,7 @@ static int ahci_da850_probe(struct platform_device *pdev)
u32 mpy; u32 mpy;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -148,7 +148,7 @@ static int ahci_dm816_probe(struct platform_device *pdev) ...@@ -148,7 +148,7 @@ static int ahci_dm816_probe(struct platform_device *pdev)
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -1127,7 +1127,7 @@ static int imx_ahci_probe(struct platform_device *pdev) ...@@ -1127,7 +1127,7 @@ static int imx_ahci_probe(struct platform_device *pdev)
return ret; return ret;
} }
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -142,7 +142,7 @@ static int mtk_ahci_probe(struct platform_device *pdev) ...@@ -142,7 +142,7 @@ static int mtk_ahci_probe(struct platform_device *pdev)
if (!plat) if (!plat)
return -ENOMEM; return -ENOMEM;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -158,7 +158,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev) ...@@ -158,7 +158,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev)
const struct mbus_dram_target_info *dram; const struct mbus_dram_target_info *dram;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -43,7 +43,7 @@ static int ahci_probe(struct platform_device *pdev) ...@@ -43,7 +43,7 @@ static int ahci_probe(struct platform_device *pdev)
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -250,7 +250,7 @@ static int ahci_qoriq_probe(struct platform_device *pdev) ...@@ -250,7 +250,7 @@ static int ahci_qoriq_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -164,7 +164,7 @@ static int ahci_seattle_probe(struct platform_device *pdev) ...@@ -164,7 +164,7 @@ static int ahci_seattle_probe(struct platform_device *pdev)
int rc; int rc;
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -156,7 +156,7 @@ static int st_ahci_probe(struct platform_device *pdev) ...@@ -156,7 +156,7 @@ static int st_ahci_probe(struct platform_device *pdev)
if (!drv_data) if (!drv_data)
return -ENOMEM; return -ENOMEM;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
hpriv->plat_data = drv_data; hpriv->plat_data = drv_data;
......
...@@ -181,7 +181,7 @@ static int ahci_sunxi_probe(struct platform_device *pdev) ...@@ -181,7 +181,7 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -494,7 +494,7 @@ static int tegra_ahci_probe(struct platform_device *pdev) ...@@ -494,7 +494,7 @@ static int tegra_ahci_probe(struct platform_device *pdev)
int ret; int ret;
unsigned int i; unsigned int i;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -759,7 +759,7 @@ static int xgene_ahci_probe(struct platform_device *pdev) ...@@ -759,7 +759,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
&xgene_ahci_v2_port_info }; &xgene_ahci_v2_port_info };
int rc; int rc;
hpriv = ahci_platform_get_resources(pdev); hpriv = ahci_platform_get_resources(pdev, 0);
if (IS_ERR(hpriv)) if (IS_ERR(hpriv))
return PTR_ERR(hpriv); return PTR_ERR(hpriv);
......
...@@ -332,6 +332,7 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port, ...@@ -332,6 +332,7 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port,
/** /**
* ahci_platform_get_resources - Get platform resources * ahci_platform_get_resources - Get platform resources
* @pdev: platform device to get resources for * @pdev: platform device to get resources for
* @flags: bitmap representing the resource to get
* *
* This function allocates an ahci_host_priv struct, and gets the following * This function allocates an ahci_host_priv struct, and gets the following
* resources, storing a reference to them inside the returned struct: * resources, storing a reference to them inside the returned struct:
...@@ -345,7 +346,8 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port, ...@@ -345,7 +346,8 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port,
* RETURNS: * RETURNS:
* The allocated ahci_host_priv on success, otherwise an ERR_PTR value * The allocated ahci_host_priv on success, otherwise an ERR_PTR value
*/ */
struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev) struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,
unsigned int flags)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv; struct ahci_host_priv *hpriv;
......
...@@ -30,7 +30,7 @@ void ahci_platform_disable_regulators(struct ahci_host_priv *hpriv); ...@@ -30,7 +30,7 @@ void ahci_platform_disable_regulators(struct ahci_host_priv *hpriv);
int ahci_platform_enable_resources(struct ahci_host_priv *hpriv); int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
void ahci_platform_disable_resources(struct ahci_host_priv *hpriv); void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
struct ahci_host_priv *ahci_platform_get_resources( struct ahci_host_priv *ahci_platform_get_resources(
struct platform_device *pdev); struct platform_device *pdev, unsigned int flags);
int ahci_platform_init_host(struct platform_device *pdev, int ahci_platform_init_host(struct platform_device *pdev,
struct ahci_host_priv *hpriv, struct ahci_host_priv *hpriv,
const struct ata_port_info *pi_template, const struct ata_port_info *pi_template,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment