Skip to contentSkip to conversation

platform/chrome: cros_ec_lpc_mec: remove cros_ec_lpc_mec_destroy()

PATCH Applied Tzung-Bi Shih 4 participants 5 messages Oct 31, 2022 – Nov 1, 2022

Subsystems (2)
lore
Share & tools
lore

Tzung-Bi Shih

author maintainer
#0 lore raw

PATCH 1/1 platform/chrome: cros_ec_lpc_mec: remove cros_ec_lpc_mec_destroy()

It's pointless (and invalid) to destroy a statically allocated mutex in cros_ec_lpc_mec_destroy().

Let's remove it.

---
A follow up from https://patchwork.kernel.org/project/chrome-platform/patch/20221028141411.1.I0728421299079b104710c202d5d7095b2674fd8c@changeid/.

 drivers/platform/chrome/cros_ec_lpc.c     | 3 ---
 drivers/platform/chrome/cros_ec_lpc_mec.c | 6 ------
 drivers/platform/chrome/cros_ec_lpc_mec.h | 7 -------
 drivers/platform/chrome/wilco_ec/core.c   | 5 -----
 4 files changed, 21 deletions(-)
drivers/platform/chrome/cros_ec_lpc.c +0 -3
index 7677ab3c0ead..6ef5e5d40ba4 100644
@@ -593,7 +593,6 @@ static int __init cros_ec_lpc_init(void)
 	ret = platform_driver_register(&cros_ec_lpc_driver);
 	if (ret) {
 		pr_err(DRV_NAME ": can't register driver: %d\n", ret);
-		cros_ec_lpc_mec_destroy();
 		return ret;
 	}
 
@@ -603,7 +602,6 @@ static int __init cros_ec_lpc_init(void)
 		if (ret) {
 			pr_err(DRV_NAME ": can't register device: %d\n", ret);
 			platform_driver_unregister(&cros_ec_lpc_driver);
-			cros_ec_lpc_mec_destroy();
 		}
 	}
 
@@ -615,7 +613,6 @@ static void __exit cros_ec_lpc_exit(void)
 	if (!cros_ec_lpc_acpi_device_found)
 		platform_device_unregister(&cros_ec_lpc_device);
 	platform_driver_unregister(&cros_ec_lpc_driver);
-	cros_ec_lpc_mec_destroy();
 }
 
 module_init(cros_ec_lpc_init);
drivers/platform/chrome/cros_ec_lpc_mec.c +0 -6
index bbc2884f5e2f..0d9c79b270ce 100644
@@ -146,9 +146,3 @@ void cros_ec_lpc_mec_init(unsigned int base, unsigned int end)
 	mec_emi_end = end;
 }
 EXPORT_SYMBOL(cros_ec_lpc_mec_init);
-
-void cros_ec_lpc_mec_destroy(void)
-{
-	mutex_destroy(&io_mutex);
-}
-EXPORT_SYMBOL(cros_ec_lpc_mec_destroy);
drivers/platform/chrome/cros_ec_lpc_mec.h +0 -7
index aa1018f6b0f2..9d0521b23e8a 100644
@@ -45,13 +45,6 @@ enum cros_ec_lpc_mec_io_type {
  */
 void cros_ec_lpc_mec_init(unsigned int base, unsigned int end);
 
-/*
- * cros_ec_lpc_mec_destroy
- *
- * Cleanup MEC I/O.
- */
-void cros_ec_lpc_mec_destroy(void);
-
 /**
  * cros_ec_lpc_mec_in_range() - Determine if addresses are in MEC EMI range.
  *
drivers/platform/chrome/wilco_ec/core.c +0 -5
index 5b42992bff38..d6a994bdc182 100644
@@ -129,7 +129,6 @@ static int wilco_ec_probe(struct platform_device *pdev)
 unregister_debugfs:
 	if (ec->debugfs_pdev)
 		platform_device_unregister(ec->debugfs_pdev);
-	cros_ec_lpc_mec_destroy();
 	return ret;
 }
 
@@ -143,10 +142,6 @@ static int wilco_ec_remove(struct platform_device *pdev)
 	platform_device_unregister(ec->rtc_pdev);
 	if (ec->debugfs_pdev)
 		platform_device_unregister(ec->debugfs_pdev);
-
-	/* Teardown cros_ec interface */
-	cros_ec_lpc_mec_destroy();
-
 	return 0;
 }
 
Signature · 1 line
2.38.1.273.g43a17bfeac-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Tzung-Bi Shih

It's pointless (and invalid) to destroy a statically allocated mutex in cros_ec_lpc_mec_destroy().

Let's remove it.

Quoted 95 lines

---
A follow up from https://patchwork.kernel.org/project/chrome-platform/patch/20221028141411.1.I0728421299079b104710c202d5d7095b2674fd8c@changeid/.

 drivers/platform/chrome/cros_ec_lpc.c     | 3 ---
 drivers/platform/chrome/cros_ec_lpc_mec.c | 6 ------
 drivers/platform/chrome/cros_ec_lpc_mec.h | 7 -------
 drivers/platform/chrome/wilco_ec/core.c   | 5 -----
 4 files changed, 21 deletions(-)
drivers/platform/chrome/cros_ec_lpc.c +0 -3
index 7677ab3c0ead..6ef5e5d40ba4 100644
@@ -593,7 +593,6 @@ static int __init cros_ec_lpc_init(void)
        ret = platform_driver_register(&cros_ec_lpc_driver);
        if (ret) {
                pr_err(DRV_NAME ": can't register driver: %d\n", ret);
-               cros_ec_lpc_mec_destroy();
                return ret;
        }
 
@@ -603,7 +602,6 @@ static int __init cros_ec_lpc_init(void)
                if (ret) {
                        pr_err(DRV_NAME ": can't register device: %d\n", ret);
                        platform_driver_unregister(&cros_ec_lpc_driver);
-                       cros_ec_lpc_mec_destroy();
                }
        }
 
@@ -615,7 +613,6 @@ static void __exit cros_ec_lpc_exit(void)
        if (!cros_ec_lpc_acpi_device_found)
                platform_device_unregister(&cros_ec_lpc_device);
        platform_driver_unregister(&cros_ec_lpc_driver);
-       cros_ec_lpc_mec_destroy();
 }
 
 module_init(cros_ec_lpc_init);
drivers/platform/chrome/cros_ec_lpc_mec.c +0 -6
index bbc2884f5e2f..0d9c79b270ce 100644
@@ -146,9 +146,3 @@ void cros_ec_lpc_mec_init(unsigned int base, unsigned int end)
        mec_emi_end = end;
 }
 EXPORT_SYMBOL(cros_ec_lpc_mec_init);
-
-void cros_ec_lpc_mec_destroy(void)
-{
-       mutex_destroy(&io_mutex);
-}
-EXPORT_SYMBOL(cros_ec_lpc_mec_destroy);
drivers/platform/chrome/cros_ec_lpc_mec.h +0 -7
index aa1018f6b0f2..9d0521b23e8a 100644
@@ -45,13 +45,6 @@ enum cros_ec_lpc_mec_io_type {
  */
 void cros_ec_lpc_mec_init(unsigned int base, unsigned int end);
 
-/*
- * cros_ec_lpc_mec_destroy
- *
- * Cleanup MEC I/O.
- */
-void cros_ec_lpc_mec_destroy(void);
-
 /**
  * cros_ec_lpc_mec_in_range() - Determine if addresses are in MEC EMI range.
  *
drivers/platform/chrome/wilco_ec/core.c +0 -6
index 5b42992bff38..d6a994bdc182 100644
@@ -129,7 +129,6 @@ static int wilco_ec_probe(struct platform_device *pdev)
 unregister_debugfs:
        if (ec->debugfs_pdev)
                platform_device_unregister(ec->debugfs_pdev);
-       cros_ec_lpc_mec_destroy();
        return ret;
 }
 
@@ -143,10 +142,6 @@ static int wilco_ec_remove(struct platform_device *pdev)
        platform_device_unregister(ec->rtc_pdev);
        if (ec->debugfs_pdev)
                platform_device_unregister(ec->debugfs_pdev);
-
-       /* Teardown cros_ec interface */
-       cros_ec_lpc_mec_destroy();
-
        return 0;
 }
 
--

2.38.1.273.g43a17bfeac-goog

Reviewed-by on v1 1/1
#2 lore raw
In reply to Tzung-Bi Shih
Quoted 6 lines · Tzung-Bi Shih

It's pointless (and invalid) to destroy a statically allocated mutex in cros_ec_lpc_mec_destroy().

Let's remove it.

This whole init()/destroy() thing hiding global state is kind of weird in the first place, and if this ever properly becomes non-global state, we might want to have a matching destroy() API back. But for now, this probably makes more sense.

(Alternatively, one could leave an empty function. But I think that might hurt someone else's sense of style.)

So:

#3 lore raw
In reply to Tzung-Bi Shih
This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-kernelci) by Tzung-Bi Shih <[email protected]>:

Quoted 8 lines · On Mon, 31 Oct 2022 13:06:57 +0800 you wrote:

It's pointless (and invalid) to destroy a statically allocated mutex in cros_ec_lpc_mec_destroy().

Let's remove it.

[...]

Here is the summary with links:
- platform/chrome: cros_ec_lpc_mec: remove cros_ec_lpc_mec_destroy()

    https://git.kernel.org/chrome-platform/c/9888feb9c68b

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
#4 lore raw
In reply to Tzung-Bi Shih
This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <[email protected]>:

Hello:

This patch was applied to chrome-platform/linux.git (for-next) by Tzung-Bi Shih <[email protected]>:

Quoted 8 lines · On Mon, 31 Oct 2022 13:06:57 +0800 you wrote:

It's pointless (and invalid) to destroy a statically allocated mutex in cros_ec_lpc_mec_destroy().

Let's remove it.

[...]

Here is the summary with links:
- platform/chrome: cros_ec_lpc_mec: remove cros_ec_lpc_mec_destroy()

    https://git.kernel.org/chrome-platform/c/9888feb9c68b

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html