* [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded
@ 2013-09-17 7:59 Axel Lin
2013-09-17 8:00 ` [PATCH 2/2] mmc: sdhci-bcm2835: " Axel Lin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Axel Lin @ 2013-09-17 7:59 UTC (permalink / raw)
To: Chris Ball; +Cc: Christian Daudt, linux-mmc
This avoid duplicated implementation and also fixes missing iounmap() and
release_mem_region() calls in sdhci_bcm_kona_remove().
sdhci_pltfm_init() calls request_mem_region() and ioremap(), thus we need to
call the corresponding iounmap() and release_mem_region() calls in
sdhci_bcm_kona_remove().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/mmc/host/sdhci-bcm-kona.c | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
index 85472d3..7a190fe 100644
--- a/drivers/mmc/host/sdhci-bcm-kona.c
+++ b/drivers/mmc/host/sdhci-bcm-kona.c
@@ -316,19 +316,7 @@ err_pltfm_free:
static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev)
{
- struct sdhci_host *host = platform_get_drvdata(pdev);
- int dead;
- u32 scratch;
-
- dead = 0;
- scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
- if (scratch == (u32)-1)
- dead = 1;
- sdhci_remove_host(host, dead);
-
- sdhci_free_host(host);
-
- return 0;
+ return sdhci_pltfm_unregister(pdev);
}
static struct platform_driver sdhci_bcm_kona_driver = {
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] mmc: sdhci-bcm2835: Use sdhci_pltfm_unregister instead of open coded
2013-09-17 7:59 [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded Axel Lin
@ 2013-09-17 8:00 ` Axel Lin
2013-09-18 20:51 ` Stephen Warren
2013-09-20 17:32 ` [PATCH 1/2] mmc: sdhci-bcm-kona: " Christian Daudt
2013-09-26 2:06 ` Chris Ball
2 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2013-09-17 8:00 UTC (permalink / raw)
To: Chris Ball; +Cc: Christian Daudt, Stephen Warren, linux-mmc
This avoid duplicated implementation.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
drivers/mmc/host/sdhci-bcm2835.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c
index 36fa2df..f6d8d67 100644
--- a/drivers/mmc/host/sdhci-bcm2835.c
+++ b/drivers/mmc/host/sdhci-bcm2835.c
@@ -178,13 +178,7 @@ err:
static int bcm2835_sdhci_remove(struct platform_device *pdev)
{
- struct sdhci_host *host = platform_get_drvdata(pdev);
- int dead = (readl(host->ioaddr + SDHCI_INT_STATUS) == 0xffffffff);
-
- sdhci_remove_host(host, dead);
- sdhci_pltfm_free(pdev);
-
- return 0;
+ return sdhci_pltfm_unregister(pdev);
}
static const struct of_device_id bcm2835_sdhci_of_match[] = {
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded
2013-09-17 7:59 [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded Axel Lin
2013-09-17 8:00 ` [PATCH 2/2] mmc: sdhci-bcm2835: " Axel Lin
@ 2013-09-20 17:32 ` Christian Daudt
2013-09-26 2:06 ` Chris Ball
2 siblings, 0 replies; 5+ messages in thread
From: Christian Daudt @ 2013-09-20 17:32 UTC (permalink / raw)
To: Axel Lin; +Cc: Chris Ball, linux-mmc
On 13-09-17 12:59 AM, Axel Lin wrote:
> This avoid duplicated implementation and also fixes missing iounmap() and
> release_mem_region() calls in sdhci_bcm_kona_remove().
> sdhci_pltfm_init() calls request_mem_region() and ioremap(), thus we need to
> call the corresponding iounmap() and release_mem_region() calls in
> sdhci_bcm_kona_remove().
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> drivers/mmc/host/sdhci-bcm-kona.c | 14 +-------------
> 1 file changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-bcm-kona.c b/drivers/mmc/host/sdhci-bcm-kona.c
> index 85472d3..7a190fe 100644
> --- a/drivers/mmc/host/sdhci-bcm-kona.c
> +++ b/drivers/mmc/host/sdhci-bcm-kona.c
> @@ -316,19 +316,7 @@ err_pltfm_free:
>
> static int __exit sdhci_bcm_kona_remove(struct platform_device *pdev)
> {
> - struct sdhci_host *host = platform_get_drvdata(pdev);
> - int dead;
> - u32 scratch;
> -
> - dead = 0;
> - scratch = readl(host->ioaddr + SDHCI_INT_STATUS);
> - if (scratch == (u32)-1)
> - dead = 1;
> - sdhci_remove_host(host, dead);
> -
> - sdhci_free_host(host);
> -
> - return 0;
> + return sdhci_pltfm_unregister(pdev);
> }
>
> static struct platform_driver sdhci_bcm_kona_driver = {
Acked-by: Christian Daudt <csd@broadcom.com>
Thanks !
csd
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded
2013-09-17 7:59 [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded Axel Lin
2013-09-17 8:00 ` [PATCH 2/2] mmc: sdhci-bcm2835: " Axel Lin
2013-09-20 17:32 ` [PATCH 1/2] mmc: sdhci-bcm-kona: " Christian Daudt
@ 2013-09-26 2:06 ` Chris Ball
2 siblings, 0 replies; 5+ messages in thread
From: Chris Ball @ 2013-09-26 2:06 UTC (permalink / raw)
To: Axel Lin; +Cc: Christian Daudt, linux-mmc
Hi Axel,
On Tue, Sep 17 2013, Axel Lin wrote:
> This avoid duplicated implementation and also fixes missing iounmap() and
> release_mem_region() calls in sdhci_bcm_kona_remove().
> sdhci_pltfm_init() calls request_mem_region() and ioremap(), thus we need to
> call the corresponding iounmap() and release_mem_region() calls in
> sdhci_bcm_kona_remove().
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Thanks, pushed to mmc-next for 3.13.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-09-26 2:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-09-17 7:59 [PATCH 1/2] mmc: sdhci-bcm-kona: Use sdhci_pltfm_unregister instead of open coded Axel Lin
2013-09-17 8:00 ` [PATCH 2/2] mmc: sdhci-bcm2835: " Axel Lin
2013-09-18 20:51 ` Stephen Warren
2013-09-20 17:32 ` [PATCH 1/2] mmc: sdhci-bcm-kona: " Christian Daudt
2013-09-26 2:06 ` 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).