* [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove()
@ 2012-10-03 13:26 Andy Shevchenko
2012-10-03 13:26 ` [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver() Andy Shevchenko
2012-10-03 13:41 ` [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Girish K S
0 siblings, 2 replies; 11+ messages in thread
From: Andy Shevchenko @ 2012-10-03 13:26 UTC (permalink / raw)
To: Chris Ball, linux-mmc; +Cc: Andy Shevchenko
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/mmc/host/dw_mmc-pci.c | 2 +-
drivers/mmc/host/dw_mmc-pltfm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c
index edb37e9..53a09cb 100644
--- a/drivers/mmc/host/dw_mmc-pci.c
+++ b/drivers/mmc/host/dw_mmc-pci.c
@@ -134,7 +134,7 @@ static struct pci_driver dw_mci_pci_driver = {
.name = "dw_mmc_pci",
.id_table = dw_mci_pci_id,
.probe = dw_mci_pci_probe,
- .remove = dw_mci_pci_remove,
+ .remove = __devexit_p(dw_mci_pci_remove),
.driver = {
.pm = &dw_mci_pci_pmops
},
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index c960ca7..777c585 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -119,7 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
static struct platform_driver dw_mci_pltfm_driver = {
- .remove = __exit_p(dw_mci_pltfm_remove),
+ .remove = __devexit_p(dw_mci_pltfm_remove),
.driver = {
.name = "dw_mmc",
.of_match_table = of_match_ptr(dw_mci_pltfm_match),
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver()
2012-10-03 13:26 [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Andy Shevchenko
@ 2012-10-03 13:26 ` Andy Shevchenko
2012-10-03 13:56 ` Girish K S
2012-10-04 12:10 ` Will Newton
2012-10-03 13:41 ` [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Girish K S
1 sibling, 2 replies; 11+ messages in thread
From: Andy Shevchenko @ 2012-10-03 13:26 UTC (permalink / raw)
To: Chris Ball, linux-mmc; +Cc: Andy Shevchenko
Since v3.2 we have nice macro to define the platform driver's init and exit
calls. This patch simplifies the dw_mmc platform driver by using that macro.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/mmc/host/dw_mmc-pltfm.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 777c585..779335b 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -119,6 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
static struct platform_driver dw_mci_pltfm_driver = {
+ .probe = dw_mci_pltfm_probe,
.remove = __devexit_p(dw_mci_pltfm_remove),
.driver = {
.name = "dw_mmc",
@@ -127,18 +128,7 @@ static struct platform_driver dw_mci_pltfm_driver = {
},
};
-static int __init dw_mci_init(void)
-{
- return platform_driver_probe(&dw_mci_pltfm_driver, dw_mci_pltfm_probe);
-}
-
-static void __exit dw_mci_exit(void)
-{
- platform_driver_unregister(&dw_mci_pltfm_driver);
-}
-
-module_init(dw_mci_init);
-module_exit(dw_mci_exit);
+module_platform_driver(dw_mci_pltfm_driver);
MODULE_DESCRIPTION("DW Multimedia Card Interface driver");
MODULE_AUTHOR("NXP Semiconductor VietNam");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove()
2012-10-03 13:26 [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Andy Shevchenko
2012-10-03 13:26 ` [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver() Andy Shevchenko
@ 2012-10-03 13:41 ` Girish K S
2012-10-03 13:43 ` Andy Shevchenko
2012-10-03 13:45 ` [PATCHv2] mmc: dw_mmc: use __devexit_p " Andy Shevchenko
1 sibling, 2 replies; 11+ messages in thread
From: Girish K S @ 2012-10-03 13:41 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Chris Ball, linux-mmc
its __devexit_p not __devinit_p
On 3 October 2012 22:26, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/mmc/host/dw_mmc-pci.c | 2 +-
> drivers/mmc/host/dw_mmc-pltfm.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c
> index edb37e9..53a09cb 100644
> --- a/drivers/mmc/host/dw_mmc-pci.c
> +++ b/drivers/mmc/host/dw_mmc-pci.c
> @@ -134,7 +134,7 @@ static struct pci_driver dw_mci_pci_driver = {
> .name = "dw_mmc_pci",
> .id_table = dw_mci_pci_id,
> .probe = dw_mci_pci_probe,
> - .remove = dw_mci_pci_remove,
> + .remove = __devexit_p(dw_mci_pci_remove),
> .driver = {
> .pm = &dw_mci_pci_pmops
> },
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index c960ca7..777c585 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -119,7 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
> MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
>
> static struct platform_driver dw_mci_pltfm_driver = {
> - .remove = __exit_p(dw_mci_pltfm_remove),
> + .remove = __devexit_p(dw_mci_pltfm_remove),
> .driver = {
> .name = "dw_mmc",
> .of_match_table = of_match_ptr(dw_mci_pltfm_match),
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove()
2012-10-03 13:41 ` [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Girish K S
@ 2012-10-03 13:43 ` Andy Shevchenko
2012-10-03 13:45 ` [PATCHv2] mmc: dw_mmc: use __devexit_p " Andy Shevchenko
1 sibling, 0 replies; 11+ messages in thread
From: Andy Shevchenko @ 2012-10-03 13:43 UTC (permalink / raw)
To: Girish K S; +Cc: Chris Ball, linux-mmc
On Wed, 2012-10-03 at 22:41 +0900, Girish K S wrote:
> its __devexit_p not __devinit_p
True. Thanks for catching this typo.
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCHv2] mmc: dw_mmc: use __devexit_p macro for .remove()
2012-10-03 13:41 ` [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Girish K S
2012-10-03 13:43 ` Andy Shevchenko
@ 2012-10-03 13:45 ` Andy Shevchenko
2012-10-03 13:59 ` Girish K S
2012-10-04 12:11 ` Will Newton
1 sibling, 2 replies; 11+ messages in thread
From: Andy Shevchenko @ 2012-10-03 13:45 UTC (permalink / raw)
To: Chris Ball, linux-mmc, Girish K S; +Cc: Andy Shevchenko
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/mmc/host/dw_mmc-pci.c | 2 +-
drivers/mmc/host/dw_mmc-pltfm.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c
index edb37e9..53a09cb 100644
--- a/drivers/mmc/host/dw_mmc-pci.c
+++ b/drivers/mmc/host/dw_mmc-pci.c
@@ -134,7 +134,7 @@ static struct pci_driver dw_mci_pci_driver = {
.name = "dw_mmc_pci",
.id_table = dw_mci_pci_id,
.probe = dw_mci_pci_probe,
- .remove = dw_mci_pci_remove,
+ .remove = __devexit_p(dw_mci_pci_remove),
.driver = {
.pm = &dw_mci_pci_pmops
},
diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index c960ca7..777c585 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -119,7 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
static struct platform_driver dw_mci_pltfm_driver = {
- .remove = __exit_p(dw_mci_pltfm_remove),
+ .remove = __devexit_p(dw_mci_pltfm_remove),
.driver = {
.name = "dw_mmc",
.of_match_table = of_match_ptr(dw_mci_pltfm_match),
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver()
2012-10-03 13:26 ` [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver() Andy Shevchenko
@ 2012-10-03 13:56 ` Girish K S
2012-10-04 12:10 ` Will Newton
1 sibling, 0 replies; 11+ messages in thread
From: Girish K S @ 2012-10-03 13:56 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Chris Ball, linux-mmc
Reviewd By:Girish K S <girish.shivanajappa@linaro.org>
On 3 October 2012 22:26, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Since v3.2 we have nice macro to define the platform driver's init and exit
> calls. This patch simplifies the dw_mmc platform driver by using that macro.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/mmc/host/dw_mmc-pltfm.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index 777c585..779335b 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -119,6 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
> MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
>
> static struct platform_driver dw_mci_pltfm_driver = {
> + .probe = dw_mci_pltfm_probe,
> .remove = __devexit_p(dw_mci_pltfm_remove),
> .driver = {
> .name = "dw_mmc",
> @@ -127,18 +128,7 @@ static struct platform_driver dw_mci_pltfm_driver = {
> },
> };
>
> -static int __init dw_mci_init(void)
> -{
> - return platform_driver_probe(&dw_mci_pltfm_driver, dw_mci_pltfm_probe);
> -}
> -
> -static void __exit dw_mci_exit(void)
> -{
> - platform_driver_unregister(&dw_mci_pltfm_driver);
> -}
> -
> -module_init(dw_mci_init);
> -module_exit(dw_mci_exit);
> +module_platform_driver(dw_mci_pltfm_driver);
>
> MODULE_DESCRIPTION("DW Multimedia Card Interface driver");
> MODULE_AUTHOR("NXP Semiconductor VietNam");
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] mmc: dw_mmc: use __devexit_p macro for .remove()
2012-10-03 13:45 ` [PATCHv2] mmc: dw_mmc: use __devexit_p " Andy Shevchenko
@ 2012-10-03 13:59 ` Girish K S
2012-10-04 12:11 ` Will Newton
1 sibling, 0 replies; 11+ messages in thread
From: Girish K S @ 2012-10-03 13:59 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Chris Ball, linux-mmc
Reviewed By:- Girish K S <girish.shivananjappa@linaro.org>
On 3 October 2012 22:45, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/mmc/host/dw_mmc-pci.c | 2 +-
> drivers/mmc/host/dw_mmc-pltfm.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/dw_mmc-pci.c b/drivers/mmc/host/dw_mmc-pci.c
> index edb37e9..53a09cb 100644
> --- a/drivers/mmc/host/dw_mmc-pci.c
> +++ b/drivers/mmc/host/dw_mmc-pci.c
> @@ -134,7 +134,7 @@ static struct pci_driver dw_mci_pci_driver = {
> .name = "dw_mmc_pci",
> .id_table = dw_mci_pci_id,
> .probe = dw_mci_pci_probe,
> - .remove = dw_mci_pci_remove,
> + .remove = __devexit_p(dw_mci_pci_remove),
> .driver = {
> .pm = &dw_mci_pci_pmops
> },
> diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
> index c960ca7..777c585 100644
> --- a/drivers/mmc/host/dw_mmc-pltfm.c
> +++ b/drivers/mmc/host/dw_mmc-pltfm.c
> @@ -119,7 +119,7 @@ static const struct of_device_id dw_mci_pltfm_match[] = {
> MODULE_DEVICE_TABLE(of, dw_mci_pltfm_match);
>
> static struct platform_driver dw_mci_pltfm_driver = {
> - .remove = __exit_p(dw_mci_pltfm_remove),
> + .remove = __devexit_p(dw_mci_pltfm_remove),
> .driver = {
> .name = "dw_mmc",
> .of_match_table = of_match_ptr(dw_mci_pltfm_match),
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver()
2012-10-03 13:26 ` [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver() Andy Shevchenko
2012-10-03 13:56 ` Girish K S
@ 2012-10-04 12:10 ` Will Newton
2012-10-23 21:14 ` Chris Ball
1 sibling, 1 reply; 11+ messages in thread
From: Will Newton @ 2012-10-04 12:10 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Chris Ball, linux-mmc
On Wed, Oct 3, 2012 at 2:26 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Since v3.2 we have nice macro to define the platform driver's init and exit
> calls. This patch simplifies the dw_mmc platform driver by using that macro.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/mmc/host/dw_mmc-pltfm.c | 14 ++------------
> 1 file changed, 2 insertions(+), 12 deletions(-)
Acked-by: Will Newton <will.newton@imgtec.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] mmc: dw_mmc: use __devexit_p macro for .remove()
2012-10-03 13:45 ` [PATCHv2] mmc: dw_mmc: use __devexit_p " Andy Shevchenko
2012-10-03 13:59 ` Girish K S
@ 2012-10-04 12:11 ` Will Newton
2012-10-23 21:13 ` Chris Ball
1 sibling, 1 reply; 11+ messages in thread
From: Will Newton @ 2012-10-04 12:11 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: Chris Ball, linux-mmc, Girish K S
On Wed, Oct 3, 2012 at 2:45 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/mmc/host/dw_mmc-pci.c | 2 +-
> drivers/mmc/host/dw_mmc-pltfm.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Will Newton <will.newton@imgtec.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCHv2] mmc: dw_mmc: use __devexit_p macro for .remove()
2012-10-04 12:11 ` Will Newton
@ 2012-10-23 21:13 ` Chris Ball
0 siblings, 0 replies; 11+ messages in thread
From: Chris Ball @ 2012-10-23 21:13 UTC (permalink / raw)
To: Will Newton; +Cc: Andy Shevchenko, linux-mmc, Girish K S
Hi,
On Thu, Oct 04 2012, Will Newton wrote:
> On Wed, Oct 3, 2012 at 2:45 PM, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> ---
>> drivers/mmc/host/dw_mmc-pci.c | 2 +-
>> drivers/mmc/host/dw_mmc-pltfm.c | 2 +-
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> Acked-by: Will Newton <will.newton@imgtec.com>
Thanks, pushed to mmc-next for 3.8
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver()
2012-10-04 12:10 ` Will Newton
@ 2012-10-23 21:14 ` Chris Ball
0 siblings, 0 replies; 11+ messages in thread
From: Chris Ball @ 2012-10-23 21:14 UTC (permalink / raw)
To: Will Newton; +Cc: Andy Shevchenko, linux-mmc
Hi,
On Thu, Oct 04 2012, Will Newton wrote:
> On Wed, Oct 3, 2012 at 2:26 PM, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
>> Since v3.2 we have nice macro to define the platform driver's init and exit
>> calls. This patch simplifies the dw_mmc platform driver by using that macro.
>>
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>> ---
>> drivers/mmc/host/dw_mmc-pltfm.c | 14 ++------------
>> 1 file changed, 2 insertions(+), 12 deletions(-)
>
> Acked-by: Will Newton <will.newton@imgtec.com>
Thanks, pushed to mmc-next for 3.8.
- Chris.
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-10-23 21:14 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-03 13:26 [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Andy Shevchenko
2012-10-03 13:26 ` [PATCH 2/2] mmc: dw_mmc: use helper macro module_platform_driver() Andy Shevchenko
2012-10-03 13:56 ` Girish K S
2012-10-04 12:10 ` Will Newton
2012-10-23 21:14 ` Chris Ball
2012-10-03 13:41 ` [PATCH 1/2] mmc: dw_mmc: use __devinit_p macro for .remove() Girish K S
2012-10-03 13:43 ` Andy Shevchenko
2012-10-03 13:45 ` [PATCHv2] mmc: dw_mmc: use __devexit_p " Andy Shevchenko
2012-10-03 13:59 ` Girish K S
2012-10-04 12:11 ` Will Newton
2012-10-23 21:13 ` Chris Ball
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox