Skip to contentSkip to conversation

pcmcia: cs: Replace manual mutex locking with guard(mutex)

PATCH In review Maxwell Doose 3 participants 6 messages Jun 3 – Jun 4 Pcmcia

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 pcmcia: cs: Replace manual mutex locking with guard(mutex)

The current code uses manual mutex locking. Replace it with the RAII guard(mutex) alongside some helpers to help condense some sections and increase readability.

---
 drivers/pcmcia/cs.c | 208 ++++++++++++++++++++++----------------------
 1 file changed, 104 insertions(+), 104 deletions(-)
drivers/pcmcia/cs.c +104 -104
index adbc486af2ea..200167eb863f 100644
@@ -159,9 +159,8 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
 	spin_lock_init(&socket->thread_lock);
 
 	if (socket->resource_ops->init) {
-		mutex_lock(&socket->ops_mutex);
-		ret = socket->resource_ops->init(socket);
-		mutex_unlock(&socket->ops_mutex);
+		scoped_guard(mutex, &socket->ops_mutex)
+			ret = socket->resource_ops->init(socket);
 		if (ret)
 			goto err;
 	}
@@ -220,9 +219,9 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
 
 	/* wait for sysfs to drop all references */
 	if (socket->resource_ops->exit) {
-		mutex_lock(&socket->ops_mutex);
+		guard(mutex)(&socket->ops_mutex);
+
 		socket->resource_ops->exit(socket);
-		mutex_unlock(&socket->ops_mutex);
 	}
 	wait_for_completion(&socket->socket_released);
 } /* pcmcia_unregister_socket */
@@ -259,6 +258,24 @@ static int socket_reset(struct pcmcia_socket *skt)
 	return -ETIMEDOUT;
 }
 
+static void socket_shutdown_helper(struct pcmcia_socket *s)
+{
+	guard(mutex)(&s->ops_mutex);
+
+	s->state &= SOCKET_INUSE | SOCKET_PRESENT;
+	msleep(shutdown_delay * 10);
+	s->state &= SOCKET_INUSE;
+
+	/* Blank out the socket state */
+	s->socket = dead_socket;
+	s->ops->init(s);
+	s->ops->set_socket(s, &s->socket);
+	s->lock_count = 0;
+	kfree(s->fake_cis);
+	s->fake_cis = NULL;
+	s->functions = 0;
+}
+
 /*
  * socket_setup() and socket_shutdown() are called by the main event handler
  * when card insertion and removal events are received.
@@ -274,27 +291,13 @@ static void socket_shutdown(struct pcmcia_socket *s)
 	if (s->callback)
 		s->callback->remove(s);
 
-	mutex_lock(&s->ops_mutex);
-	s->state &= SOCKET_INUSE | SOCKET_PRESENT;
-	msleep(shutdown_delay * 10);
-	s->state &= SOCKET_INUSE;
-
-	/* Blank out the socket state */
-	s->socket = dead_socket;
-	s->ops->init(s);
-	s->ops->set_socket(s, &s->socket);
-	s->lock_count = 0;
-	kfree(s->fake_cis);
-	s->fake_cis = NULL;
-	s->functions = 0;
-
 	/* From here on we can be sure that only we (that is, the
 	 * pccardd thread) accesses this socket, and all (16-bit)
 	 * PCMCIA interactions are gone. Therefore, release
 	 * ops_mutex so that we don't get a sysfs-related lockdep
 	 * warning.
 	 */
-	mutex_unlock(&s->ops_mutex);
+	socket_shutdown_helper(s);
 
 #ifdef CONFIG_CARDBUS
 	cb_free(s);
@@ -396,6 +399,10 @@ static int socket_insert(struct pcmcia_socket *skt)
 
 	dev_dbg(&skt->dev, "insert\n");
 
+	/*
+	 * NOTE: Converting to guard(mutex) may require refactoring some of this
+	 * code so not converted.
+	 */
 	mutex_lock(&skt->ops_mutex);
 	if (skt->state & SOCKET_INUSE) {
 		mutex_unlock(&skt->ops_mutex);
@@ -435,7 +442,7 @@ static int socket_suspend(struct pcmcia_socket *skt)
 	if ((skt->state & SOCKET_SUSPEND) && !(skt->state & SOCKET_IN_RESUME))
 		return -EBUSY;
 
-	mutex_lock(&skt->ops_mutex);
+	guard(mutex)(&skt->ops_mutex);
 	/* store state on first suspend, but not after spurious wakeups */
 	if (!(skt->state & SOCKET_IN_RESUME))
 		skt->suspended_state = skt->state;
@@ -446,20 +453,21 @@ static int socket_suspend(struct pcmcia_socket *skt)
 		skt->ops->suspend(skt);
 	skt->state |= SOCKET_SUSPEND;
 	skt->state &= ~SOCKET_IN_RESUME;
-	mutex_unlock(&skt->ops_mutex);
+
 	return 0;
 }
 
 static int socket_early_resume(struct pcmcia_socket *skt)
 {
-	mutex_lock(&skt->ops_mutex);
+	guard(mutex)(&skt->ops_mutex);
+
 	skt->socket = dead_socket;
 	skt->ops->init(skt);
 	skt->ops->set_socket(skt, &skt->socket);
 	if (skt->state & SOCKET_PRESENT)
 		skt->resume_status = socket_setup(skt, resume_delay);
 	skt->state |= SOCKET_IN_RESUME;
-	mutex_unlock(&skt->ops_mutex);
+
 	return 0;
 }
 
@@ -467,9 +475,8 @@ static int socket_late_resume(struct pcmcia_socket *skt)
 {
 	int ret = 0;
 
-	mutex_lock(&skt->ops_mutex);
-	skt->state &= ~(SOCKET_SUSPEND | SOCKET_IN_RESUME);
-	mutex_unlock(&skt->ops_mutex);
+	scoped_guard(mutex, &skt->ops_mutex)
+		skt->state &= ~(SOCKET_SUSPEND | SOCKET_IN_RESUME);
 
 	if (!(skt->state & SOCKET_PRESENT)) {
 		ret = socket_insert(skt);
@@ -572,6 +579,48 @@ static void socket_detect_change(struct pcmcia_socket *skt)
 	}
 }
 
+static int pccardd_helper(struct pcmcia_socket *skt, unsigned int events,
+			  unsigned int sysfs_events)
+{
+	int ret;
+
+	guard(mutex)(&skt->skt_mutex);
+
+	if (events & SS_DETECT)
+		socket_detect_change(skt);
+
+	if (sysfs_events) {
+		if (sysfs_events & PCMCIA_UEVENT_EJECT)
+			socket_remove(skt);
+		if (sysfs_events & PCMCIA_UEVENT_INSERT)
+			socket_insert(skt);
+		if ((sysfs_events & PCMCIA_UEVENT_SUSPEND) &&
+		    !(skt->state & SOCKET_CARDBUS)) {
+			if (skt->callback)
+				ret = skt->callback->suspend(skt);
+			else
+				ret = 0;
+			if (!ret) {
+				socket_suspend(skt);
+				msleep(100);
+			}
+		}
+		if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&
+		    !(skt->state & SOCKET_CARDBUS)) {
+			ret = socket_resume(skt);
+			if (!ret && skt->callback)
+				skt->callback->resume(skt);
+		}
+		if ((sysfs_events & PCMCIA_UEVENT_REQUERY) &&
+		    !(skt->state & SOCKET_CARDBUS)) {
+			if (!ret && skt->callback)
+				skt->callback->requery(skt);
+		}
+	}
+
+	return ret;
+}
+
 static int pccardd(void *__skt)
 {
 	struct pcmcia_socket *skt = __skt;
@@ -613,39 +662,7 @@ static int pccardd(void *__skt)
 		skt->sysfs_events = 0;
 		spin_unlock_irqrestore(&skt->thread_lock, flags);
 
-		mutex_lock(&skt->skt_mutex);
-		if (events & SS_DETECT)
-			socket_detect_change(skt);
-
-		if (sysfs_events) {
-			if (sysfs_events & PCMCIA_UEVENT_EJECT)
-				socket_remove(skt);
-			if (sysfs_events & PCMCIA_UEVENT_INSERT)
-				socket_insert(skt);
-			if ((sysfs_events & PCMCIA_UEVENT_SUSPEND) &&
-				!(skt->state & SOCKET_CARDBUS)) {
-				if (skt->callback)
-					ret = skt->callback->suspend(skt);
-				else
-					ret = 0;
-				if (!ret) {
-					socket_suspend(skt);
-					msleep(100);
-				}
-			}
-			if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&
-				!(skt->state & SOCKET_CARDBUS)) {
-				ret = socket_resume(skt);
-				if (!ret && skt->callback)
-					skt->callback->resume(skt);
-			}
-			if ((sysfs_events & PCMCIA_UEVENT_REQUERY) &&
-				!(skt->state & SOCKET_CARDBUS)) {
-				if (!ret && skt->callback)
-					skt->callback->requery(skt);
-			}
-		}
-		mutex_unlock(&skt->skt_mutex);
+		ret = pccardd_helper(skt, events, sysfs_events);
 
 		if (events || sysfs_events)
 			continue;
@@ -663,9 +680,9 @@ static int pccardd(void *__skt)
 
 	/* shut down socket, if a device is still present */
 	if (skt->state & SOCKET_PRESENT) {
-		mutex_lock(&skt->skt_mutex);
+		guard(mutex)(&skt->skt_mutex);
+
 		socket_remove(skt);
-		mutex_unlock(&skt->skt_mutex);
 	}
 
 	/* remove from the device core */
@@ -722,17 +739,13 @@ EXPORT_SYMBOL(pcmcia_parse_uevents);
 /* register pcmcia_callback */
 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c)
 {
-	int ret = 0;
-
 	/* s->skt_mutex also protects s->callback */
-	mutex_lock(&s->skt_mutex);
+	guard(mutex)(&s->skt_mutex);
 
 	if (c) {
 		/* registration */
-		if (s->callback) {
-			ret = -EBUSY;
-			goto err;
-		}
+		if (s->callback)
+			return -EBUSY;
 
 		s->callback = c;
 
@@ -740,10 +753,8 @@ int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c)
 			s->callback->add(s);
 	} else
 		s->callback = NULL;
- err:
-	mutex_unlock(&s->skt_mutex);
 
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL(pccard_register_pcmcia);
 
@@ -759,35 +770,27 @@ int pcmcia_reset_card(struct pcmcia_socket *skt)
 
 	dev_dbg(&skt->dev, "resetting socket\n");
 
-	mutex_lock(&skt->skt_mutex);
-	do {
-		if (!(skt->state & SOCKET_PRESENT)) {
-			dev_dbg(&skt->dev, "can't reset, not present\n");
-			ret = -ENODEV;
-			break;
-		}
-		if (skt->state & SOCKET_SUSPEND) {
-			dev_dbg(&skt->dev, "can't reset, suspended\n");
-			ret = -EBUSY;
-			break;
-		}
-		if (skt->state & SOCKET_CARDBUS) {
-			dev_dbg(&skt->dev, "can't reset, is cardbus\n");
-			ret = -EPERM;
-			break;
-		}
+	guard(mutex)(&skt->skt_mutex);
 
-		if (skt->callback)
-			skt->callback->suspend(skt);
-		mutex_lock(&skt->ops_mutex);
+	if (!(skt->state & SOCKET_PRESENT)) {
+		dev_dbg(&skt->dev, "can't reset, not present\n");
+		return -ENODEV;
+	}
+	if (skt->state & SOCKET_SUSPEND) {
+		dev_dbg(&skt->dev, "can't reset, suspended\n");
+		return -EBUSY;
+	}
+	if (skt->state & SOCKET_CARDBUS) {
+		dev_dbg(&skt->dev, "can't reset, is cardbus\n");
+		return -EPERM;
+	}
+
+	if (skt->callback)
+		skt->callback->suspend(skt);
+	scoped_guard(mutex, &skt->ops_mutex)
 		ret = socket_reset(skt);
-		mutex_unlock(&skt->ops_mutex);
-		if ((ret == 0) && (skt->callback))
-			skt->callback->resume(skt);
-
-		ret = 0;
-	} while (0);
-	mutex_unlock(&skt->skt_mutex);
+	if ((ret == 0) && (skt->callback))
+		skt->callback->resume(skt);
 
 	return ret;
 } /* reset_card */
@@ -820,13 +823,10 @@ static int __pcmcia_pm_op(struct device *dev,
 			  int (*callback) (struct pcmcia_socket *skt))
 {
 	struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev);
-	int ret;
 
-	mutex_lock(&s->skt_mutex);
-	ret = callback(s);
-	mutex_unlock(&s->skt_mutex);
+	guard(mutex)(&s->skt_mutex);
 
-	return ret;
+	return callback(s);
 }
 
 static int pcmcia_socket_dev_suspend_noirq(struct device *dev)
Signature · 1 line
2.54.0
#1 lore raw
kernel test robot noticed the following build warnings:

Hi Maxwell,

kernel test robot noticed the following build warnings:

[auto build test WARNING on linus/master]
[also build test WARNING on v7.1-rc6 next-20260602]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Maxwell-Doose/pcmcia-cs-Replace-manual-mutex-locking-with-guard-mutex/20260603-144020
base:   linus/master
patch link:    https://lore.kernel.org/r/20260603062714.45848-1-m32285159%40gmail.com
patch subject: [PATCH] pcmcia: cs: Replace manual mutex locking with guard(mutex)
config: x86_64-rhel-9.4-rust (https://download.01.org/0day-ci/archive/20260603/[email protected]/config)
compiler: clang version 22.0.0git (https://github.com/llvm/llvm-project f43d6834093b19baf79beda8c0337ab020ac5f17)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260603/[email protected]/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

>> drivers/pcmcia/cs.c:592:6: warning: variable 'ret' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
     592 |         if (sysfs_events) {
         |             ^~~~~~~~~~~~
   drivers/pcmcia/cs.c:621:9: note: uninitialized use occurs here
     621 |         return ret;
         |                ^~~
   drivers/pcmcia/cs.c:592:2: note: remove the 'if' if its condition is always true
     592 |         if (sysfs_events) {
         |         ^~~~~~~~~~~~~~~~~
   drivers/pcmcia/cs.c:585:9: note: initialize the variable 'ret' to silence this warning
     585 |         int ret;
         |                ^
         |                 = 0

1 warning generated.

vim +592 drivers/pcmcia/cs.c

581
582 static int pccardd_helper(struct pcmcia_socket *skt, unsigned int events,
583 unsigned int sysfs_events)
584 {
585 int ret;
586
587 guard(mutex)(&skt->skt_mutex);
588
589 if (events & SS_DETECT)
590 socket_detect_change(skt);
591

 > 592		if (sysfs_events) {

593 if (sysfs_events & PCMCIA_UEVENT_EJECT)
594 socket_remove(skt);
595 if (sysfs_events & PCMCIA_UEVENT_INSERT)
596 socket_insert(skt);
597 if ((sysfs_events & PCMCIA_UEVENT_SUSPEND) &&
598 !(skt->state & SOCKET_CARDBUS)) {
599 if (skt->callback)
600 ret = skt->callback->suspend(skt);
601 else
602 ret = 0;
603 if (!ret) {
604 socket_suspend(skt);
605 msleep(100);
606 }
607 }
608 if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&
609 !(skt->state & SOCKET_CARDBUS)) {
610 ret = socket_resume(skt);
611 if (!ret && skt->callback)
612 skt->callback->resume(skt);
613 }
614 if ((sysfs_events & PCMCIA_UEVENT_REQUERY) &&
615 !(skt->state & SOCKET_CARDBUS)) {
616 if (!ret && skt->callback)
617 skt->callback->requery(skt);
618 }
619 }
620
621 return ret;
622 }
623

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

#2 lore raw
In reply to Maxwell Doose

Am Wed, Jun 03, 2026 at 01:27:12AM -0500 schrieb Maxwell Doose:

Quoted 3 lines

The current code uses manual mutex locking. Replace it with the RAII guard(mutex) alongside some helpers to help condense some sections and increase readability.

As the PCMCIA subsystem is in "odd fixes" mode, I don't see real advantages for this patch.

Thanks,
Dominik

Quoted 354 lines
---
 drivers/pcmcia/cs.c | 208 ++++++++++++++++++++++----------------------
 1 file changed, 104 insertions(+), 104 deletions(-)
drivers/pcmcia/cs.c +104 -104
index adbc486af2ea..200167eb863f 100644
@@ -159,9 +159,8 @@ int pcmcia_register_socket(struct pcmcia_socket *socket)
 	spin_lock_init(&socket->thread_lock);
 
 	if (socket->resource_ops->init) {
-		mutex_lock(&socket->ops_mutex);
-		ret = socket->resource_ops->init(socket);
-		mutex_unlock(&socket->ops_mutex);
+		scoped_guard(mutex, &socket->ops_mutex)
+			ret = socket->resource_ops->init(socket);
 		if (ret)
 			goto err;
 	}
@@ -220,9 +219,9 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
 
 	/* wait for sysfs to drop all references */
 	if (socket->resource_ops->exit) {
-		mutex_lock(&socket->ops_mutex);
+		guard(mutex)(&socket->ops_mutex);
+
 		socket->resource_ops->exit(socket);
-		mutex_unlock(&socket->ops_mutex);
 	}
 	wait_for_completion(&socket->socket_released);
 } /* pcmcia_unregister_socket */
@@ -259,6 +258,24 @@ static int socket_reset(struct pcmcia_socket *skt)
 	return -ETIMEDOUT;
 }
 
+static void socket_shutdown_helper(struct pcmcia_socket *s)
+{
+	guard(mutex)(&s->ops_mutex);
+
+	s->state &= SOCKET_INUSE | SOCKET_PRESENT;
+	msleep(shutdown_delay * 10);
+	s->state &= SOCKET_INUSE;
+
+	/* Blank out the socket state */
+	s->socket = dead_socket;
+	s->ops->init(s);
+	s->ops->set_socket(s, &s->socket);
+	s->lock_count = 0;
+	kfree(s->fake_cis);
+	s->fake_cis = NULL;
+	s->functions = 0;
+}
+
 /*
  * socket_setup() and socket_shutdown() are called by the main event handler
  * when card insertion and removal events are received.
@@ -274,27 +291,13 @@ static void socket_shutdown(struct pcmcia_socket *s)
 	if (s->callback)
 		s->callback->remove(s);
 
-	mutex_lock(&s->ops_mutex);
-	s->state &= SOCKET_INUSE | SOCKET_PRESENT;
-	msleep(shutdown_delay * 10);
-	s->state &= SOCKET_INUSE;
-
-	/* Blank out the socket state */
-	s->socket = dead_socket;
-	s->ops->init(s);
-	s->ops->set_socket(s, &s->socket);
-	s->lock_count = 0;
-	kfree(s->fake_cis);
-	s->fake_cis = NULL;
-	s->functions = 0;
-
 	/* From here on we can be sure that only we (that is, the
 	 * pccardd thread) accesses this socket, and all (16-bit)
 	 * PCMCIA interactions are gone. Therefore, release
 	 * ops_mutex so that we don't get a sysfs-related lockdep
 	 * warning.
 	 */
-	mutex_unlock(&s->ops_mutex);
+	socket_shutdown_helper(s);
 
 #ifdef CONFIG_CARDBUS
 	cb_free(s);
@@ -396,6 +399,10 @@ static int socket_insert(struct pcmcia_socket *skt)
 
 	dev_dbg(&skt->dev, "insert\n");
 
+	/*
+	 * NOTE: Converting to guard(mutex) may require refactoring some of this
+	 * code so not converted.
+	 */
 	mutex_lock(&skt->ops_mutex);
 	if (skt->state & SOCKET_INUSE) {
 		mutex_unlock(&skt->ops_mutex);
@@ -435,7 +442,7 @@ static int socket_suspend(struct pcmcia_socket *skt)
 	if ((skt->state & SOCKET_SUSPEND) && !(skt->state & SOCKET_IN_RESUME))
 		return -EBUSY;
 
-	mutex_lock(&skt->ops_mutex);
+	guard(mutex)(&skt->ops_mutex);
 	/* store state on first suspend, but not after spurious wakeups */
 	if (!(skt->state & SOCKET_IN_RESUME))
 		skt->suspended_state = skt->state;
@@ -446,20 +453,21 @@ static int socket_suspend(struct pcmcia_socket *skt)
 		skt->ops->suspend(skt);
 	skt->state |= SOCKET_SUSPEND;
 	skt->state &= ~SOCKET_IN_RESUME;
-	mutex_unlock(&skt->ops_mutex);
+
 	return 0;
 }
 
 static int socket_early_resume(struct pcmcia_socket *skt)
 {
-	mutex_lock(&skt->ops_mutex);
+	guard(mutex)(&skt->ops_mutex);
+
 	skt->socket = dead_socket;
 	skt->ops->init(skt);
 	skt->ops->set_socket(skt, &skt->socket);
 	if (skt->state & SOCKET_PRESENT)
 		skt->resume_status = socket_setup(skt, resume_delay);
 	skt->state |= SOCKET_IN_RESUME;
-	mutex_unlock(&skt->ops_mutex);
+
 	return 0;
 }
 
@@ -467,9 +475,8 @@ static int socket_late_resume(struct pcmcia_socket *skt)
 {
 	int ret = 0;
 
-	mutex_lock(&skt->ops_mutex);
-	skt->state &= ~(SOCKET_SUSPEND | SOCKET_IN_RESUME);
-	mutex_unlock(&skt->ops_mutex);
+	scoped_guard(mutex, &skt->ops_mutex)
+		skt->state &= ~(SOCKET_SUSPEND | SOCKET_IN_RESUME);
 
 	if (!(skt->state & SOCKET_PRESENT)) {
 		ret = socket_insert(skt);
@@ -572,6 +579,48 @@ static void socket_detect_change(struct pcmcia_socket *skt)
 	}
 }
 
+static int pccardd_helper(struct pcmcia_socket *skt, unsigned int events,
+			  unsigned int sysfs_events)
+{
+	int ret;
+
+	guard(mutex)(&skt->skt_mutex);
+
+	if (events & SS_DETECT)
+		socket_detect_change(skt);
+
+	if (sysfs_events) {
+		if (sysfs_events & PCMCIA_UEVENT_EJECT)
+			socket_remove(skt);
+		if (sysfs_events & PCMCIA_UEVENT_INSERT)
+			socket_insert(skt);
+		if ((sysfs_events & PCMCIA_UEVENT_SUSPEND) &&
+		    !(skt->state & SOCKET_CARDBUS)) {
+			if (skt->callback)
+				ret = skt->callback->suspend(skt);
+			else
+				ret = 0;
+			if (!ret) {
+				socket_suspend(skt);
+				msleep(100);
+			}
+		}
+		if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&
+		    !(skt->state & SOCKET_CARDBUS)) {
+			ret = socket_resume(skt);
+			if (!ret && skt->callback)
+				skt->callback->resume(skt);
+		}
+		if ((sysfs_events & PCMCIA_UEVENT_REQUERY) &&
+		    !(skt->state & SOCKET_CARDBUS)) {
+			if (!ret && skt->callback)
+				skt->callback->requery(skt);
+		}
+	}
+
+	return ret;
+}
+
 static int pccardd(void *__skt)
 {
 	struct pcmcia_socket *skt = __skt;
@@ -613,39 +662,7 @@ static int pccardd(void *__skt)
 		skt->sysfs_events = 0;
 		spin_unlock_irqrestore(&skt->thread_lock, flags);
 
-		mutex_lock(&skt->skt_mutex);
-		if (events & SS_DETECT)
-			socket_detect_change(skt);
-
-		if (sysfs_events) {
-			if (sysfs_events & PCMCIA_UEVENT_EJECT)
-				socket_remove(skt);
-			if (sysfs_events & PCMCIA_UEVENT_INSERT)
-				socket_insert(skt);
-			if ((sysfs_events & PCMCIA_UEVENT_SUSPEND) &&
-				!(skt->state & SOCKET_CARDBUS)) {
-				if (skt->callback)
-					ret = skt->callback->suspend(skt);
-				else
-					ret = 0;
-				if (!ret) {
-					socket_suspend(skt);
-					msleep(100);
-				}
-			}
-			if ((sysfs_events & PCMCIA_UEVENT_RESUME) &&
-				!(skt->state & SOCKET_CARDBUS)) {
-				ret = socket_resume(skt);
-				if (!ret && skt->callback)
-					skt->callback->resume(skt);
-			}
-			if ((sysfs_events & PCMCIA_UEVENT_REQUERY) &&
-				!(skt->state & SOCKET_CARDBUS)) {
-				if (!ret && skt->callback)
-					skt->callback->requery(skt);
-			}
-		}
-		mutex_unlock(&skt->skt_mutex);
+		ret = pccardd_helper(skt, events, sysfs_events);
 
 		if (events || sysfs_events)
 			continue;
@@ -663,9 +680,9 @@ static int pccardd(void *__skt)
 
 	/* shut down socket, if a device is still present */
 	if (skt->state & SOCKET_PRESENT) {
-		mutex_lock(&skt->skt_mutex);
+		guard(mutex)(&skt->skt_mutex);
+
 		socket_remove(skt);
-		mutex_unlock(&skt->skt_mutex);
 	}
 
 	/* remove from the device core */
@@ -722,17 +739,13 @@ EXPORT_SYMBOL(pcmcia_parse_uevents);
 /* register pcmcia_callback */
 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c)
 {
-	int ret = 0;
-
 	/* s->skt_mutex also protects s->callback */
-	mutex_lock(&s->skt_mutex);
+	guard(mutex)(&s->skt_mutex);
 
 	if (c) {
 		/* registration */
-		if (s->callback) {
-			ret = -EBUSY;
-			goto err;
-		}
+		if (s->callback)
+			return -EBUSY;
 
 		s->callback = c;
 
@@ -740,10 +753,8 @@ int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c)
 			s->callback->add(s);
 	} else
 		s->callback = NULL;
- err:
-	mutex_unlock(&s->skt_mutex);
 
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL(pccard_register_pcmcia);
 
@@ -759,35 +770,27 @@ int pcmcia_reset_card(struct pcmcia_socket *skt)
 
 	dev_dbg(&skt->dev, "resetting socket\n");
 
-	mutex_lock(&skt->skt_mutex);
-	do {
-		if (!(skt->state & SOCKET_PRESENT)) {
-			dev_dbg(&skt->dev, "can't reset, not present\n");
-			ret = -ENODEV;
-			break;
-		}
-		if (skt->state & SOCKET_SUSPEND) {
-			dev_dbg(&skt->dev, "can't reset, suspended\n");
-			ret = -EBUSY;
-			break;
-		}
-		if (skt->state & SOCKET_CARDBUS) {
-			dev_dbg(&skt->dev, "can't reset, is cardbus\n");
-			ret = -EPERM;
-			break;
-		}
+	guard(mutex)(&skt->skt_mutex);
 
-		if (skt->callback)
-			skt->callback->suspend(skt);
-		mutex_lock(&skt->ops_mutex);
+	if (!(skt->state & SOCKET_PRESENT)) {
+		dev_dbg(&skt->dev, "can't reset, not present\n");
+		return -ENODEV;
+	}
+	if (skt->state & SOCKET_SUSPEND) {
+		dev_dbg(&skt->dev, "can't reset, suspended\n");
+		return -EBUSY;
+	}
+	if (skt->state & SOCKET_CARDBUS) {
+		dev_dbg(&skt->dev, "can't reset, is cardbus\n");
+		return -EPERM;
+	}
+
+	if (skt->callback)
+		skt->callback->suspend(skt);
+	scoped_guard(mutex, &skt->ops_mutex)
 		ret = socket_reset(skt);
-		mutex_unlock(&skt->ops_mutex);
-		if ((ret == 0) && (skt->callback))
-			skt->callback->resume(skt);
-
-		ret = 0;
-	} while (0);
-	mutex_unlock(&skt->skt_mutex);
+	if ((ret == 0) && (skt->callback))
+		skt->callback->resume(skt);
 
 	return ret;
 } /* reset_card */
@@ -820,13 +823,10 @@ static int __pcmcia_pm_op(struct device *dev,
 			  int (*callback) (struct pcmcia_socket *skt))
 {
 	struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev);
-	int ret;
 
-	mutex_lock(&s->skt_mutex);
-	ret = callback(s);
-	mutex_unlock(&s->skt_mutex);
+	guard(mutex)(&s->skt_mutex);
 
-	return ret;
+	return callback(s);
 }
 
 static int pcmcia_socket_dev_suspend_noirq(struct device *dev)
Signature · 1 line
2.54.0
#3 lore raw

Hi Dominik,

Quoted 9 lines · Dominik Brodowski

Am Wed, Jun 03, 2026 at 01:27:12AM -0500 schrieb Maxwell Doose:

Quoted 3 lines

The current code uses manual mutex locking. Replace it with the RAII guard(mutex) alongside some helpers to help condense some sections and increase readability.

As the PCMCIA subsystem is in "odd fixes" mode, I don't see real advantages for this patch.

Ah. Is that because not enough time or PCMCIA isn't in use much anymore? Or something else?

Signature · 2 lines
best regards,
max
#4 lore raw

Am Thu, Jun 04, 2026 at 08:26:59AM -0500 schrieb Maxwell Doose:

Quoted 10 lines

Hi Dominik,

Quoted 6 lines · Dominik Brodowski

Am Wed, Jun 03, 2026 at 01:27:12AM -0500 schrieb Maxwell Doose:

Quoted 3 lines

The current code uses manual mutex locking. Replace it with the RAII guard(mutex) alongside some helpers to help condense some sections and increase readability.

Quoted 6 lines
Quoted 3 lines

As the PCMCIA subsystem is in "odd fixes" mode, I don't see real advantages for this patch.

Ah. Is that because not enough time or PCMCIA isn't in use much anymore? Or something else?

Both. If there are clear improvements (or even security-relevant fixes), I'm happy to take patches, but otherwise PCMCIA is slowly on its way out.

Best,
Dominik

#5 lore raw
Quoted 16 lines · Dominik Brodowski

Am Thu, Jun 04, 2026 at 08:26:59AM -0500 schrieb Maxwell Doose:

Quoted 14 lines

Hi Dominik,

Quoted 9 lines · Dominik Brodowski

Am Wed, Jun 03, 2026 at 01:27:12AM -0500 schrieb Maxwell Doose:

Quoted 3 lines

The current code uses manual mutex locking. Replace it with the RAII guard(mutex) alongside some helpers to help condense some sections and increase readability.

As the PCMCIA subsystem is in "odd fixes" mode, I don't see real advantages for this patch.

Quoted 6 lines
Quoted 2 lines

Ah. Is that because not enough time or PCMCIA isn't in use much anymore? Or something else?

Both. If there are clear improvements (or even security-relevant fixes), I'm happy to take patches, but otherwise PCMCIA is slowly on its way out.

Then I wish you and the PCMCIA subsystem the best. Thanks :)

Signature · 4 lines
best regards,
max

ps: If you don't have enough time I can help, I've got some spare time :)