linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource
@ 2013-09-12  6:46 Sachin Kamat
  2013-09-12  6:46 ` [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr Sachin Kamat
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Sachin Kamat @ 2013-09-12  6:46 UTC (permalink / raw)
  To: linux-mmc; +Cc: tgih.jun, jh80.chung, cjb, nico, sachin.kamat

devm_request_and_ioremap() is deprecated. Use devm_ioremap_resource()
instead.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/mmc/host/mvsdio.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 06c5b0b..a592407 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -775,9 +775,9 @@ static int __init mvsd_probe(struct platform_device *pdev)
 
 	spin_lock_init(&host->lock);
 
-	host->base = devm_request_and_ioremap(&pdev->dev, r);
-	if (!host->base) {
-		ret = -ENOMEM;
+	host->base = devm_ioremap_resource(&pdev->dev, r);
+	if (IS_ERR(host->base)) {
+		ret = PTR_ERR(host->base);
 		goto out;
 	}
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr
  2013-09-12  6:46 [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
@ 2013-09-12  6:46 ` Sachin Kamat
  2013-09-25  2:26   ` Jaehoon Chung
  2013-09-12  6:46 ` [PATCH 3/3] mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe Sachin Kamat
  2013-09-24 12:07 ` [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
  2 siblings, 1 reply; 7+ messages in thread
From: Sachin Kamat @ 2013-09-12  6:46 UTC (permalink / raw)
  To: linux-mmc; +Cc: tgih.jun, jh80.chung, cjb, nico, sachin.kamat

'dw_mci_socfpga_match' is always compiled in.
Hence of_match_ptr is not necessary.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/mmc/host/dw_mmc-socfpga.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/dw_mmc-socfpga.c b/drivers/mmc/host/dw_mmc-socfpga.c
index 14b5961..5ce00b2 100644
--- a/drivers/mmc/host/dw_mmc-socfpga.c
+++ b/drivers/mmc/host/dw_mmc-socfpga.c
@@ -128,7 +128,7 @@ static struct platform_driver dw_mci_socfpga_pltfm_driver = {
 	.remove		= __exit_p(dw_mci_pltfm_remove),
 	.driver		= {
 		.name		= "dwmmc_socfpga",
-		.of_match_table	= of_match_ptr(dw_mci_socfpga_match),
+		.of_match_table	= dw_mci_socfpga_match,
 		.pm		= &dw_mci_pltfm_pmops,
 	},
 };
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH 3/3] mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe
  2013-09-12  6:46 [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
  2013-09-12  6:46 ` [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr Sachin Kamat
@ 2013-09-12  6:46 ` Sachin Kamat
  2013-09-25  2:26   ` Jaehoon Chung
  2013-09-24 12:07 ` [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
  2 siblings, 1 reply; 7+ messages in thread
From: Sachin Kamat @ 2013-09-12  6:46 UTC (permalink / raw)
  To: linux-mmc; +Cc: tgih.jun, jh80.chung, cjb, nico, sachin.kamat

'dw_mci_socfpga_probe' is used only in this file. Make it static.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/mmc/host/dw_mmc-socfpga.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/host/dw_mmc-socfpga.c b/drivers/mmc/host/dw_mmc-socfpga.c
index 5ce00b2..56c7fe2 100644
--- a/drivers/mmc/host/dw_mmc-socfpga.c
+++ b/drivers/mmc/host/dw_mmc-socfpga.c
@@ -113,7 +113,7 @@ static const struct of_device_id dw_mci_socfpga_match[] = {
 };
 MODULE_DEVICE_TABLE(of, dw_mci_socfpga_match);
 
-int dw_mci_socfpga_probe(struct platform_device *pdev)
+static int dw_mci_socfpga_probe(struct platform_device *pdev)
 {
 	const struct dw_mci_drv_data *drv_data;
 	const struct of_device_id *match;
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource
  2013-09-12  6:46 [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
  2013-09-12  6:46 ` [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr Sachin Kamat
  2013-09-12  6:46 ` [PATCH 3/3] mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe Sachin Kamat
@ 2013-09-24 12:07 ` Sachin Kamat
  2013-09-26  1:57   ` Chris Ball
  2 siblings, 1 reply; 7+ messages in thread
From: Sachin Kamat @ 2013-09-24 12:07 UTC (permalink / raw)
  To: linux-mmc; +Cc: Seungwon Jeon, Jaehoon Chung, Chris Ball, Sachin Kamat

On 12 September 2013 12:16, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> devm_request_and_ioremap() is deprecated. Use devm_ioremap_resource()
> instead.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>

Gentle ping on this series Chris.

-- 
With warm regards,
Sachin

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr
  2013-09-12  6:46 ` [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr Sachin Kamat
@ 2013-09-25  2:26   ` Jaehoon Chung
  0 siblings, 0 replies; 7+ messages in thread
From: Jaehoon Chung @ 2013-09-25  2:26 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: linux-mmc, tgih.jun, cjb, nico

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

On 09/12/2013 03:46 PM, Sachin Kamat wrote:
> 'dw_mci_socfpga_match' is always compiled in.
> Hence of_match_ptr is not necessary.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/mmc/host/dw_mmc-socfpga.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc-socfpga.c b/drivers/mmc/host/dw_mmc-socfpga.c
> index 14b5961..5ce00b2 100644
> --- a/drivers/mmc/host/dw_mmc-socfpga.c
> +++ b/drivers/mmc/host/dw_mmc-socfpga.c
> @@ -128,7 +128,7 @@ static struct platform_driver dw_mci_socfpga_pltfm_driver = {
>  	.remove		= __exit_p(dw_mci_pltfm_remove),
>  	.driver		= {
>  		.name		= "dwmmc_socfpga",
> -		.of_match_table	= of_match_ptr(dw_mci_socfpga_match),
> +		.of_match_table	= dw_mci_socfpga_match,
>  		.pm		= &dw_mci_pltfm_pmops,
>  	},
>  };
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 3/3] mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe
  2013-09-12  6:46 ` [PATCH 3/3] mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe Sachin Kamat
@ 2013-09-25  2:26   ` Jaehoon Chung
  0 siblings, 0 replies; 7+ messages in thread
From: Jaehoon Chung @ 2013-09-25  2:26 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: linux-mmc, tgih.jun, cjb, nico

Acked-by: Jaehoon Chung <jh80.chung@samsung.com>

On 09/12/2013 03:46 PM, Sachin Kamat wrote:
> 'dw_mci_socfpga_probe' is used only in this file. Make it static.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/mmc/host/dw_mmc-socfpga.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mmc/host/dw_mmc-socfpga.c b/drivers/mmc/host/dw_mmc-socfpga.c
> index 5ce00b2..56c7fe2 100644
> --- a/drivers/mmc/host/dw_mmc-socfpga.c
> +++ b/drivers/mmc/host/dw_mmc-socfpga.c
> @@ -113,7 +113,7 @@ static const struct of_device_id dw_mci_socfpga_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, dw_mci_socfpga_match);
>  
> -int dw_mci_socfpga_probe(struct platform_device *pdev)
> +static int dw_mci_socfpga_probe(struct platform_device *pdev)
>  {
>  	const struct dw_mci_drv_data *drv_data;
>  	const struct of_device_id *match;
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource
  2013-09-24 12:07 ` [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
@ 2013-09-26  1:57   ` Chris Ball
  0 siblings, 0 replies; 7+ messages in thread
From: Chris Ball @ 2013-09-26  1:57 UTC (permalink / raw)
  To: Sachin Kamat; +Cc: linux-mmc, Seungwon Jeon, Jaehoon Chung

Hi Sachin,

On Tue, Sep 24 2013, Sachin Kamat wrote:
> On 12 September 2013 12:16, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>> devm_request_and_ioremap() is deprecated. Use devm_ioremap_resource()
>> instead.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>
> Gentle ping on this series Chris.

Thanks, all pushed to mmc-next for 3.13.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2013-09-26  1:58 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-12  6:46 [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
2013-09-12  6:46 ` [PATCH 2/3] mmc: dw_mmc-socfpga: Remove redundant of_match_ptr Sachin Kamat
2013-09-25  2:26   ` Jaehoon Chung
2013-09-12  6:46 ` [PATCH 3/3] mmc: dw_mmc-socfpga: Staticize dw_mci_socfpga_probe Sachin Kamat
2013-09-25  2:26   ` Jaehoon Chung
2013-09-24 12:07 ` [PATCH 1/3] mmc: mvsdio: Convert to devm_ioremap_resource Sachin Kamat
2013-09-26  1:57   ` Chris Ball

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).