[PATCH 0/8] platform/x86: intel: switch remaining mutex_init() to devm_mutex_init()

[PATCH 0/8] platform/x86: intel: switch remaining mutex_init() to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Convert the remaining mutex_init() calls under drivers/platform/x86/intel/
to devm_mutex_init() so the mutex lifecycle is managed by devres.  This
removes the need for manual mutex_destroy() calls and fixes several
drivers that were missing mutex_destroy() on the teardown path entirely.

Each patch converts one driver and is independent of the others.

Build-tested on x86_64 with all eight drivers compiled in.

Chitransh Mandhaniya (8):
  platform/x86: isst_if_mmio: switch to devm_mutex_init()
  platform/x86: isst_if_mbox_pci: switch to devm_mutex_init()
  platform/x86: pmt_crashlog: switch to devm_mutex_init()
  platform/x86: crystal_cove_charger: switch to devm_mutex_init()
  platform/x86: telemetry/pltdrv: switch to devm_mutex_init()
  platform/x86: ishtp_eclite: switch to devm_mutex_init()
  platform/x86: punit_ipc: switch to devm_mutex_init()
  platform/x86: sdsi: switch to devm_mutex_init()

 drivers/platform/x86/intel/crystal_cove_charger.c    |  4 +++-
 drivers/platform/x86/intel/ishtp_eclite.c            |  4 +++-
 drivers/platform/x86/intel/pmt/crashlog.c            |  6 ++++--
 drivers/platform/x86/intel/punit_ipc.c               |  4 +++-
 drivers/platform/x86/intel/sdsi.c                    |  4 +++-
 .../x86/intel/speed_select_if/isst_if_mbox_pci.c     | 12 ++++--------
 .../x86/intel/speed_select_if/isst_if_mmio.c         | 11 ++++-------
 drivers/platform/x86/intel/telemetry/pltdrv.c        |  8 ++++++--
 8 files changed, 30 insertions(+), 23 deletions(-)

-- 
2.43.0

[PATCH 1/8] platform/x86: isst_if_mmio: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex lifecycle is
managed by devres.  This removes the need for manual mutex_destroy()
calls in both the error path and the remove callback.

Since the only action on cdev_register failure was mutex_destroy(),
simplify the tail of the probe function to return the registration
result directly.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 .../platform/x86/intel/speed_select_if/isst_if_mmio.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
index 950ede5eab76..0a3fdf6b8bca 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
@@ -124,7 +124,9 @@ static int isst_if_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	if (IS_ERR(punit_dev->punit_mmio))
 		return PTR_ERR(punit_dev->punit_mmio);
 
-	mutex_init(&punit_dev->mutex);
+	ret = devm_mutex_init(&pdev->dev, &punit_dev->mutex);
+	if (ret)
+		return ret;
 	pci_set_drvdata(pdev, punit_dev);
 
 	memset(&cb, 0, sizeof(cb));
@@ -132,11 +134,7 @@ static int isst_if_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	cb.offset = offsetof(struct isst_if_io_regs, io_reg);
 	cb.cmd_callback = isst_if_mmio_rd_wr;
 	cb.owner = THIS_MODULE;
-	ret = isst_if_cdev_register(ISST_IF_DEV_MMIO, &cb);
-	if (ret)
-		mutex_destroy(&punit_dev->mutex);
-
-	return ret;
+	return isst_if_cdev_register(ISST_IF_DEV_MMIO, &cb);
 }
 
 static void isst_if_remove(struct pci_dev *pdev)
@@ -145,7 +143,6 @@ static void isst_if_remove(struct pci_dev *pdev)
 
 	punit_dev = pci_get_drvdata(pdev);
 	isst_if_cdev_unregister(ISST_IF_DEV_MMIO);
-	mutex_destroy(&punit_dev->mutex);
 }
 
 static int __maybe_unused isst_if_suspend(struct device *device)
-- 
2.43.0

[PATCH 2/8] platform/x86: isst_if_mbox_pci: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex lifecycle is
managed by devres.  This removes the need for manual mutex_destroy()
calls in both the error path and the remove callback.

Since the only action on cdev_register failure was mutex_destroy(),
simplify the tail of the probe function to return the registration
result directly.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 .../x86/intel/speed_select_if/isst_if_mbox_pci.c     | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c
index df1fc6c719f3..ea0b396d35cf 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_mbox_pci.c
@@ -180,7 +180,9 @@ static int isst_if_mbox_probe(struct pci_dev *pdev,
 	if (ret)
 		return ret;
 
-	mutex_init(&punit_dev->mutex);
+	ret = devm_mutex_init(&pdev->dev, &punit_dev->mutex);
+	if (ret)
+		return ret;
 	pci_set_drvdata(pdev, punit_dev);
 
 	memset(&cb, 0, sizeof(cb));
@@ -188,12 +190,7 @@ static int isst_if_mbox_probe(struct pci_dev *pdev,
 	cb.offset = offsetof(struct isst_if_mbox_cmds, mbox_cmd);
 	cb.cmd_callback = isst_if_mbox_proc_cmd;
 	cb.owner = THIS_MODULE;
-	ret = isst_if_cdev_register(ISST_IF_DEV_MBOX, &cb);
-
-	if (ret)
-		mutex_destroy(&punit_dev->mutex);
-
-	return ret;
+	return isst_if_cdev_register(ISST_IF_DEV_MBOX, &cb);
 }
 
 static void isst_if_mbox_remove(struct pci_dev *pdev)
@@ -202,7 +199,6 @@ static void isst_if_mbox_remove(struct pci_dev *pdev)
 
 	punit_dev = pci_get_drvdata(pdev);
 	isst_if_cdev_unregister(ISST_IF_DEV_MBOX);
-	mutex_destroy(&punit_dev->mutex);
 }
 
 static int __maybe_unused isst_if_resume(struct device *device)
-- 
2.43.0

[PATCH 3/8] platform/x86: pmt_crashlog: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex lifecycle is
managed by devres.  This removes the need for the manual
mutex_destroy() call in pmt_crashlog_remove().

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 drivers/platform/x86/intel/pmt/crashlog.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/intel/pmt/crashlog.c b/drivers/platform/x86/intel/pmt/crashlog.c
index d7018b495217..1071320ce6be 100644
--- a/drivers/platform/x86/intel/pmt/crashlog.c
+++ b/drivers/platform/x86/intel/pmt/crashlog.c
@@ -591,13 +591,16 @@ static int pmt_crashlog_pre_decode(struct intel_vsec_device *ivdev,
 	struct crashlog_entry *crashlog;
 	u32 version;
 	u32 type;
+	int ret;
 
 	if (!pmt_crashlog_supported(entry, &type, &version))
 		return 1;
 
 	/* initialize the crashlog struct */
 	crashlog = container_of(entry, struct crashlog_entry, entry);
-	mutex_init(&crashlog->control_mutex);
+	ret = devm_mutex_init(&ivdev->auxdev.dev, &crashlog->control_mutex);
+	if (ret)
+		return ret;
 
 	crashlog->info = select_crashlog_info(type, version);
 	entry->attr_grp = crashlog->info->attr_grp;
@@ -641,7 +644,6 @@ static void pmt_crashlog_remove(struct auxiliary_device *auxdev)
 		struct crashlog_entry *crashlog = &priv->entry[i];
 
 		intel_pmt_dev_destroy(&crashlog->entry, &pmt_crashlog_ns);
-		mutex_destroy(&crashlog->control_mutex);
 	}
 }
 
-- 
2.43.0

[PATCH 4/8] platform/x86: crystal_cove_charger: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex is
automatically destroyed on driver removal via devres.  The driver was
missing a mutex_destroy() call on the teardown path.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 drivers/platform/x86/intel/crystal_cove_charger.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/crystal_cove_charger.c b/drivers/platform/x86/intel/crystal_cove_charger.c
index 425c7eb32442..8ecfec2c8369 100644
--- a/drivers/platform/x86/intel/crystal_cove_charger.c
+++ b/drivers/platform/x86/intel/crystal_cove_charger.c
@@ -94,7 +94,9 @@ static int crystal_cove_charger_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	charger->regmap = pmic->regmap;
-	mutex_init(&charger->buslock);
+	ret = devm_mutex_init(&pdev->dev, &charger->buslock);
+	if (ret)
+		return ret;
 
 	charger->irq = platform_get_irq(pdev, 0);
 	if (charger->irq < 0)
-- 
2.43.0

[PATCH 5/8] platform/x86: telemetry/pltdrv: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() for both telem_lock and
telem_trace_lock so the mutex lifecycle is managed by devres.  The
driver was missing mutex_destroy() calls on the teardown path.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 drivers/platform/x86/intel/telemetry/pltdrv.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/platform/x86/intel/telemetry/pltdrv.c b/drivers/platform/x86/intel/telemetry/pltdrv.c
index d9aa349f81e4..70b74a7c6c71 100644
--- a/drivers/platform/x86/intel/telemetry/pltdrv.c
+++ b/drivers/platform/x86/intel/telemetry/pltdrv.c
@@ -904,8 +904,12 @@ static int telemetry_pltdrv_probe(struct platform_device *pdev)
 		goto out;
 	}
 
-	mutex_init(&telm_conf->telem_lock);
-	mutex_init(&telm_conf->telem_trace_lock);
+	ret = devm_mutex_init(&pdev->dev, &telm_conf->telem_lock);
+	if (ret)
+		goto out;
+	ret = devm_mutex_init(&pdev->dev, &telm_conf->telem_trace_lock);
+	if (ret)
+		goto out;
 
 	ret = telemetry_setup(pdev);
 	if (ret)
-- 
2.43.0

[PATCH 6/8] platform/x86: ishtp_eclite: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex is
automatically destroyed on driver removal via devres.  The driver was
missing a mutex_destroy() call on the teardown path.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 drivers/platform/x86/intel/ishtp_eclite.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/ishtp_eclite.c b/drivers/platform/x86/intel/ishtp_eclite.c
index bca7e217878b..d7b10ceeb52c 100644
--- a/drivers/platform/x86/intel/ishtp_eclite.c
+++ b/drivers/platform/x86/intel/ishtp_eclite.c
@@ -585,7 +585,9 @@ static int ecl_ishtp_cl_probe(struct ishtp_cl_device *cl_device)
 	dev_dbg(cl_data_to_dev(opr_dev), "eclite-ishtp client initialised\n");
 
 	opr_dev->ish_link_ready = true;
-	mutex_init(&opr_dev->lock);
+	rv = devm_mutex_init(ishtp_device(cl_device), &opr_dev->lock);
+	if (rv)
+		goto err_exit;
 
 	rv = acpi_find_eclite_device(opr_dev);
 	if (rv) {
-- 
2.43.0

[PATCH 7/8] platform/x86: punit_ipc: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex is
automatically destroyed on driver removal via devres.  The driver was
missing a mutex_destroy() call on the teardown path.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 drivers/platform/x86/intel/punit_ipc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/punit_ipc.c b/drivers/platform/x86/intel/punit_ipc.c
index a3d2b0b64135..1fdffe3ed8b8 100644
--- a/drivers/platform/x86/intel/punit_ipc.c
+++ b/drivers/platform/x86/intel/punit_ipc.c
@@ -260,7 +260,9 @@ static int intel_punit_ipc_probe(struct platform_device *pdev)
 		return ret;
 
 	punit_ipcdev->dev = &pdev->dev;
-	mutex_init(&punit_ipcdev->lock);
+	ret = devm_mutex_init(&pdev->dev, &punit_ipcdev->lock);
+	if (ret)
+		return ret;
 	init_completion(&punit_ipcdev->cmd_complete);
 
 	return 0;
-- 
2.43.0

[PATCH 8/8] platform/x86: sdsi: switch to devm_mutex_init()

[chitranshmandhaniya]

From: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>

Replace mutex_init() with devm_mutex_init() so the mutex is
automatically destroyed on driver removal via devres.  The driver was
missing a mutex_destroy() call on the teardown path.

Signed-off-by: Chitransh Mandhaniya <Chitransh_Mandhaniya@dell.com>
---
 drivers/platform/x86/intel/sdsi.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel/sdsi.c
index d7e37d4ace23..bf1ca472cb06 100644
--- a/drivers/platform/x86/intel/sdsi.c
+++ b/drivers/platform/x86/intel/sdsi.c
@@ -663,7 +663,9 @@ static int sdsi_probe(struct auxiliary_device *auxdev, const struct auxiliary_de
 		return -ENOMEM;
 
 	priv->dev = &auxdev->dev;
-	mutex_init(&priv->mb_lock);
+	ret = devm_mutex_init(&auxdev->dev, &priv->mb_lock);
+	if (ret)
+		return ret;
 	auxiliary_set_drvdata(auxdev, priv);
 
 	/* Get the SDSi discovery table */
-- 
2.43.0