Skip to content

Commit 16af2d6

Browse files
khayash1htejun
authored andcommitted
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: Hans de Goede <[email protected]> Cc: Thierry Reding <[email protected]> Cc: Matthias Brugger <[email protected]> Cc: Patrice Chotard <[email protected]> Cc: Maxime Ripard <[email protected]> Signed-off-by: Kunihiko Hayashi <[email protected]> Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Tejun Heo <[email protected]>
1 parent a69508c commit 16af2d6

16 files changed

+18
-16
lines changed

drivers/ata/ahci_brcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ static int brcm_ahci_probe(struct platform_device *pdev)
425425

426426
brcm_sata_phys_enable(priv);
427427

428-
hpriv = ahci_platform_get_resources(pdev);
428+
hpriv = ahci_platform_get_resources(pdev, 0);
429429
if (IS_ERR(hpriv))
430430
return PTR_ERR(hpriv);
431431
hpriv->plat_data = priv;

drivers/ata/ahci_ceva.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ static int ceva_ahci_probe(struct platform_device *pdev)
213213

214214
cevapriv->ahci_pdev = pdev;
215215

216-
hpriv = ahci_platform_get_resources(pdev);
216+
hpriv = ahci_platform_get_resources(pdev, 0);
217217
if (IS_ERR(hpriv))
218218
return PTR_ERR(hpriv);
219219

drivers/ata/ahci_da850.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static int ahci_da850_probe(struct platform_device *pdev)
171171
u32 mpy;
172172
int rc;
173173

174-
hpriv = ahci_platform_get_resources(pdev);
174+
hpriv = ahci_platform_get_resources(pdev, 0);
175175
if (IS_ERR(hpriv))
176176
return PTR_ERR(hpriv);
177177

drivers/ata/ahci_dm816.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static int ahci_dm816_probe(struct platform_device *pdev)
148148
struct ahci_host_priv *hpriv;
149149
int rc;
150150

151-
hpriv = ahci_platform_get_resources(pdev);
151+
hpriv = ahci_platform_get_resources(pdev, 0);
152152
if (IS_ERR(hpriv))
153153
return PTR_ERR(hpriv);
154154

drivers/ata/ahci_imx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ static int imx_ahci_probe(struct platform_device *pdev)
11271127
return ret;
11281128
}
11291129

1130-
hpriv = ahci_platform_get_resources(pdev);
1130+
hpriv = ahci_platform_get_resources(pdev, 0);
11311131
if (IS_ERR(hpriv))
11321132
return PTR_ERR(hpriv);
11331133

drivers/ata/ahci_mtk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static int mtk_ahci_probe(struct platform_device *pdev)
142142
if (!plat)
143143
return -ENOMEM;
144144

145-
hpriv = ahci_platform_get_resources(pdev);
145+
hpriv = ahci_platform_get_resources(pdev, 0);
146146
if (IS_ERR(hpriv))
147147
return PTR_ERR(hpriv);
148148

drivers/ata/ahci_mvebu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ static int ahci_mvebu_probe(struct platform_device *pdev)
158158
const struct mbus_dram_target_info *dram;
159159
int rc;
160160

161-
hpriv = ahci_platform_get_resources(pdev);
161+
hpriv = ahci_platform_get_resources(pdev, 0);
162162
if (IS_ERR(hpriv))
163163
return PTR_ERR(hpriv);
164164

drivers/ata/ahci_platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static int ahci_probe(struct platform_device *pdev)
4343
struct ahci_host_priv *hpriv;
4444
int rc;
4545

46-
hpriv = ahci_platform_get_resources(pdev);
46+
hpriv = ahci_platform_get_resources(pdev, 0);
4747
if (IS_ERR(hpriv))
4848
return PTR_ERR(hpriv);
4949

drivers/ata/ahci_qoriq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ static int ahci_qoriq_probe(struct platform_device *pdev)
250250
struct resource *res;
251251
int rc;
252252

253-
hpriv = ahci_platform_get_resources(pdev);
253+
hpriv = ahci_platform_get_resources(pdev, 0);
254254
if (IS_ERR(hpriv))
255255
return PTR_ERR(hpriv);
256256

drivers/ata/ahci_seattle.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ static int ahci_seattle_probe(struct platform_device *pdev)
164164
int rc;
165165
struct ahci_host_priv *hpriv;
166166

167-
hpriv = ahci_platform_get_resources(pdev);
167+
hpriv = ahci_platform_get_resources(pdev, 0);
168168
if (IS_ERR(hpriv))
169169
return PTR_ERR(hpriv);
170170

drivers/ata/ahci_st.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static int st_ahci_probe(struct platform_device *pdev)
156156
if (!drv_data)
157157
return -ENOMEM;
158158

159-
hpriv = ahci_platform_get_resources(pdev);
159+
hpriv = ahci_platform_get_resources(pdev, 0);
160160
if (IS_ERR(hpriv))
161161
return PTR_ERR(hpriv);
162162
hpriv->plat_data = drv_data;

drivers/ata/ahci_sunxi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static int ahci_sunxi_probe(struct platform_device *pdev)
181181
struct ahci_host_priv *hpriv;
182182
int rc;
183183

184-
hpriv = ahci_platform_get_resources(pdev);
184+
hpriv = ahci_platform_get_resources(pdev, 0);
185185
if (IS_ERR(hpriv))
186186
return PTR_ERR(hpriv);
187187

drivers/ata/ahci_tegra.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ static int tegra_ahci_probe(struct platform_device *pdev)
494494
int ret;
495495
unsigned int i;
496496

497-
hpriv = ahci_platform_get_resources(pdev);
497+
hpriv = ahci_platform_get_resources(pdev, 0);
498498
if (IS_ERR(hpriv))
499499
return PTR_ERR(hpriv);
500500

drivers/ata/ahci_xgene.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ static int xgene_ahci_probe(struct platform_device *pdev)
759759
&xgene_ahci_v2_port_info };
760760
int rc;
761761

762-
hpriv = ahci_platform_get_resources(pdev);
762+
hpriv = ahci_platform_get_resources(pdev, 0);
763763
if (IS_ERR(hpriv))
764764
return PTR_ERR(hpriv);
765765

drivers/ata/libahci_platform.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ static int ahci_platform_get_regulator(struct ahci_host_priv *hpriv, u32 port,
332332
/**
333333
* ahci_platform_get_resources - Get platform resources
334334
* @pdev: platform device to get resources for
335+
* @flags: bitmap representing the resource to get
335336
*
336337
* This function allocates an ahci_host_priv struct, and gets the following
337338
* 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,
345346
* RETURNS:
346347
* The allocated ahci_host_priv on success, otherwise an ERR_PTR value
347348
*/
348-
struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
349+
struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev,
350+
unsigned int flags)
349351
{
350352
struct device *dev = &pdev->dev;
351353
struct ahci_host_priv *hpriv;

include/linux/ahci_platform.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void ahci_platform_disable_regulators(struct ahci_host_priv *hpriv);
3030
int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
3131
void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
3232
struct ahci_host_priv *ahci_platform_get_resources(
33-
struct platform_device *pdev);
33+
struct platform_device *pdev, unsigned int flags);
3434
int ahci_platform_init_host(struct platform_device *pdev,
3535
struct ahci_host_priv *hpriv,
3636
const struct ata_port_info *pi_template,

0 commit comments

Comments
 (0)