[PATCH] spi: use module_pci_driver

[PATCH] spi: use module_pci_driver

[Axel Lin]

This patch converts the drivers in drivers/spi/* to use module_pci_driver()
macro which makes the code smaller and a bit simpler.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
 drivers/spi/spi-dw-pci.c     |   13 +------------
 drivers/spi/spi-pxa2xx-pci.c |   12 +-----------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index 14f7cc9..ff81abb 100644
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -164,18 +164,7 @@ static struct pci_driver dw_spi_driver = {
 	.resume	=	spi_resume,
 };
 
-static int __init mrst_spi_init(void)
-{
-	return pci_register_driver(&dw_spi_driver);
-}
-
-static void __exit mrst_spi_exit(void)
-{
-	pci_unregister_driver(&dw_spi_driver);
-}
-
-module_init(mrst_spi_init);
-module_exit(mrst_spi_exit);
+module_pci_driver(dw_spi_driver);
 
 MODULE_AUTHOR("Feng Tang <feng.tang@intel.com>");
 MODULE_DESCRIPTION("PCI interface driver for DW SPI Core");
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 3fb44af..9f6ba34 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -164,17 +164,7 @@ static struct pci_driver ce4100_spi_driver = {
 	.remove         = __devexit_p(ce4100_spi_remove),
 };
 
-static int __init ce4100_spi_init(void)
-{
-	return pci_register_driver(&ce4100_spi_driver);
-}
-module_init(ce4100_spi_init);
-
-static void __exit ce4100_spi_exit(void)
-{
-	pci_unregister_driver(&ce4100_spi_driver);
-}
-module_exit(ce4100_spi_exit);
+module_pci_driver(ce4100_spi_driver);
 
 MODULE_DESCRIPTION("CE4100 PCI-SPI glue code for PXA's driver");
 MODULE_LICENSE("GPL v2");
-- 
1.7.5.4

Re: [PATCH] spi: use module_pci_driver

[Grant Likely]

On Wed, 04 Apr 2012 22:29:32 +0800, Axel Lin <axel.lin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> This patch converts the drivers in drivers/spi/* to use module_pci_driver()
> macro which makes the code smaller and a bit simpler.
> 
> Signed-off-by: Axel Lin <axel.lin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Applied, thanks.

g.

> ---
>  drivers/spi/spi-dw-pci.c     |   13 +------------
>  drivers/spi/spi-pxa2xx-pci.c |   12 +-----------
>  2 files changed, 2 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
> index 14f7cc9..ff81abb 100644
> --- a/drivers/spi/spi-dw-pci.c
> +++ b/drivers/spi/spi-dw-pci.c
> @@ -164,18 +164,7 @@ static struct pci_driver dw_spi_driver = {
>  	.resume	=	spi_resume,
>  };
>  
> -static int __init mrst_spi_init(void)
> -{
> -	return pci_register_driver(&dw_spi_driver);
> -}
> -
> -static void __exit mrst_spi_exit(void)
> -{
> -	pci_unregister_driver(&dw_spi_driver);
> -}
> -
> -module_init(mrst_spi_init);
> -module_exit(mrst_spi_exit);
> +module_pci_driver(dw_spi_driver);
>  
>  MODULE_AUTHOR("Feng Tang <feng.tang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>");
>  MODULE_DESCRIPTION("PCI interface driver for DW SPI Core");
> diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
> index 3fb44af..9f6ba34 100644
> --- a/drivers/spi/spi-pxa2xx-pci.c
> +++ b/drivers/spi/spi-pxa2xx-pci.c
> @@ -164,17 +164,7 @@ static struct pci_driver ce4100_spi_driver = {
>  	.remove         = __devexit_p(ce4100_spi_remove),
>  };
>  
> -static int __init ce4100_spi_init(void)
> -{
> -	return pci_register_driver(&ce4100_spi_driver);
> -}
> -module_init(ce4100_spi_init);
> -
> -static void __exit ce4100_spi_exit(void)
> -{
> -	pci_unregister_driver(&ce4100_spi_driver);
> -}
> -module_exit(ce4100_spi_exit);
> +module_pci_driver(ce4100_spi_driver);
>  
>  MODULE_DESCRIPTION("CE4100 PCI-SPI glue code for PXA's driver");
>  MODULE_LICENSE("GPL v2");
> -- 
> 1.7.5.4
> 
> 
> 

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.

------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second 
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev