Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1281981 > unrolled thread

[PATCH] Input: sparcspkr - Use platform_register/unregister_drivers()

Back to article view | Back to linux.kernel

Contents

  [PATCH] Input: sparcspkr - Use platform_register/unregister_drivers() Thierry Reding <thierry.reding@gmail.com> - 2015-12-02 17:30 +0100
    Re: [PATCH] Input: sparcspkr - Use  platform_register/unregister_drivers() Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2015-12-02 18:40 +0100

#1281981 — [PATCH] Input: sparcspkr - Use platform_register/unregister_drivers()

From: Thierry Reding <treding@nvidia.com>

These new helpers simplify implementing multi-driver modules and
properly handle failure to register one driver by unregistering all
previously registered drivers.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/input/misc/sparcspkr.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 6f997aa49183..4a5afc7fe96e 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -345,23 +345,19 @@ static struct platform_driver grover_beep_driver = {
 	.shutdown	= sparcspkr_shutdown,
 };
 
+static struct platform_driver * const drivers[] = {
+	&bbc_beep_driver,
+	&grover_beep_driver,
+};
+
 static int __init sparcspkr_init(void)
 {
-	int err = platform_driver_register(&bbc_beep_driver);
-
-	if (!err) {
-		err = platform_driver_register(&grover_beep_driver);
-		if (err)
-			platform_driver_unregister(&bbc_beep_driver);
-	}
-
-	return err;
+	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
 }
 
 static void __exit sparcspkr_exit(void)
 {
-	platform_driver_unregister(&bbc_beep_driver);
-	platform_driver_unregister(&grover_beep_driver);
+	platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
 }
 
 module_init(sparcspkr_init);
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1282155 — Re: [PATCH] Input: sparcspkr - Use platform_register/unregister_drivers()

On Wed, Dec 02, 2015 at 05:25:19PM +0100, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
> 
> These new helpers simplify implementing multi-driver modules and
> properly handle failure to register one driver by unregistering all
> previously registered drivers.
> 
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Applied, thank you.

> ---
>  drivers/input/misc/sparcspkr.c | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
> index 6f997aa49183..4a5afc7fe96e 100644
> --- a/drivers/input/misc/sparcspkr.c
> +++ b/drivers/input/misc/sparcspkr.c
> @@ -345,23 +345,19 @@ static struct platform_driver grover_beep_driver = {
>  	.shutdown	= sparcspkr_shutdown,
>  };
>  
> +static struct platform_driver * const drivers[] = {
> +	&bbc_beep_driver,
> +	&grover_beep_driver,
> +};
> +
>  static int __init sparcspkr_init(void)
>  {
> -	int err = platform_driver_register(&bbc_beep_driver);
> -
> -	if (!err) {
> -		err = platform_driver_register(&grover_beep_driver);
> -		if (err)
> -			platform_driver_unregister(&bbc_beep_driver);
> -	}
> -
> -	return err;
> +	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));
>  }
>  
>  static void __exit sparcspkr_exit(void)
>  {
> -	platform_driver_unregister(&bbc_beep_driver);
> -	platform_driver_unregister(&grover_beep_driver);
> +	platform_unregister_drivers(drivers, ARRAY_SIZE(drivers));
>  }
>  
>  module_init(sparcspkr_init);
> -- 
> 2.5.0
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web