From nobody Mon Jun 8 06:36:16 2026 Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AED3B2C08BC for ; Wed, 3 Jun 2026 06:29:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780468163; cv=none; b=oAPy9U9foPxqWr7ZSCttzPuLovLPmIpT6GN87FRw6EG2YruSVahHHO6oek0snpal+CHzr/xoRF3tgpf7anObjAEF7p2sdvyyY/0V5JNvghUxRNJPsATMJu87tG2R2Dq63OLqMFwcd+7Z7fuQqpr6CzFeip9XiJIFpGAlPWXGQoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780468163; c=relaxed/simple; bh=7gNxf/QzES1FuiPBXilatMSLMNA65rIMtYkbz7gIdto=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aSgci+XkTt8CFI39h/veOGSUrwGGczJ/SLFjFP4xlx0zM8zWiYKn++Jei5k5sNIuF0rZLa8qfmwE7erZUAlbOACuTyZMj39ugw8++u/ry71LvXxbz6qH4FIcbJVfe2q5vROkSs/mY1Ak481hsDOmub0pOUzzXa2hw0Cbw/SflKc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kCk/8tJb; arc=none smtp.client-ip=209.85.167.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kCk/8tJb" Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-486503ae8f0so1020050b6e.0 for ; Tue, 02 Jun 2026 23:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780468160; x=1781072960; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tsift2HRAjNwYTjKaFekQ7A36k12rRrn+mMJYhGadYY=; b=kCk/8tJbJbqSVU/h0cvaMZyNscU8h3tosgmG7920h+weMZcBxRL7vXQ5fePy8hFuGQ n5qbP5O7e5KbWdTQt426ym8/Lz5E4M9rwvB0UALd8rahUag9cXJeD87uMx0b94KRHL09 o576ybQhTIDrzYCBIVd4bbiaqFbOuGEAoy/TEVgsluyxRgMp/HI57oxXSRMYto5j0+cj NaDp37/r1+7M2RKVnruLrtQtJ8FyhYGVfs/+hsttzsRiN+Zc6fvIaT+KlX0laKWtwFSn mh6mqG9yf/QpuHALzfSvLnbDhyCU9oX5jSweiys5357BxvO5W1ldKraRjqcaUTqzY3S3 8AtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780468160; x=1781072960; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tsift2HRAjNwYTjKaFekQ7A36k12rRrn+mMJYhGadYY=; b=j1qQ+psgEJ0KpMTMuonx7DC73JSW3koefeVU8u2lgxNUi+nq/dm+UbQIiZnTlGW88q 6/8rfabOlFDJY+kRUCJlxj9Utt1r/3fP9ogtxN34D+1zH26ukaa2esvxB3m4gXBJ/Nsh e/2pcFCyZWIzL3Mb8BjJd4zjwZpwhiL3wHEsIKZfzzaBI88yqAYV1f+BIeMa5ZxYkyxL 9o+eLMB7ORmxa4PjwdHWz1R6hS6lpDrHkLyw0B3B5GeJWxm5+1TwMi8zHRYy3klpbOGF 7+JHPtbFQ7OkJkskfewJQcwhA7s1pltNUzXkby6hC7OORw4HCx78qMN9PtKcfmzUXVUo NJ9A== X-Forwarded-Encrypted: i=1; AFNElJ+pZoKRYpu5Kw8BlRLbO5mV1gy7/606kwcTIh2d5e7u/C4axUOsqa9tQUiVKn8HQs+sTDOccrTI9oWzPWg=@vger.kernel.org X-Gm-Message-State: AOJu0YyKBvHwZ6uasJuiyk7PcA62S0MqYoO/11rbkRfImApI5hQBlruS x+hYGAA44EolsyXHwE7HTew0Sks3RkdtqhlC2vPp0QJtFUzcBui17XWPaF1zE8DohFQ= X-Gm-Gg: Acq92OFULf8BntrMzJ86hRO++ixc1syT/SWOzLtbhTRTsnlOgT3Mi34zLbaWBNOWuDN IA/RQHlSLAPxj4rLiaG0gq8OzZ0guHC/F8fJMlS4cF2hFbXx85hUTeywBVWR3fnV4Fx/azf6idz zM2azu6FG6GDoydX2R539wzBDV9Kb/4+eM5PABxw72vjMqPUaKwV8FaHWdNEH7N4/QJBw1EMF/P 03iIw8RzGGWObAHPKm9776cmq15NL2F44B/xCAwXp68dimiin/NlcAW4kbucsfxOQYd/MhHGmTQ ya17/e0Ul+cL2Q1pi0NeUnyGtJzA6eEAzC5pNUwMzwQ+VW3Iydb9/g9wjC5V0DIq1E/8Up7eOPd eL+1zat+IFik++SfgStb+mSJOGOoWWw8MfJNWk51LhhZkwbSIU4SD1OoQ9w9AVLEwPQKEddjt+b K7NJhQNIN8M9PtclvrzdZOKxsXK05CWqFz2R9ksZG4iwI1tt4Mz/rmItrZXaFMFP/TMuL0Kcke X-Received: by 2002:a05:6808:198b:b0:479:ca1e:ad80 with SMTP id 5614622812f47-4865a99ff04mr1062109b6e.5.1780468160346; Tue, 02 Jun 2026 23:29:20 -0700 (PDT) Received: from i-use-arch-btw.lan (23-88-128-2.fttp.usinternet.com. [23.88.128.2]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4865b9c733fsm1076310b6e.16.2026.06.02.23.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2026 23:29:19 -0700 (PDT) From: Maxwell Doose To: linux@dominikbrodowski.net Cc: Maxwell Doose , linux-kernel@vger.kernel.org (open list) Subject: [PATCH] pcmcia: cs: Replace manual mutex locking with guard(mutex) Date: Wed, 3 Jun 2026 01:27:12 -0500 Message-ID: <20260603062714.45848-1-m32285159@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Maxwell Doose --- drivers/pcmcia/cs.c | 208 ++++++++++++++++++++++---------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index adbc486af2ea..200167eb863f 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -159,9 +159,8 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) spin_lock_init(&socket->thread_lock); =20 if (socket->resource_ops->init) { - mutex_lock(&socket->ops_mutex); - ret =3D socket->resource_ops->init(socket); - mutex_unlock(&socket->ops_mutex); + scoped_guard(mutex, &socket->ops_mutex) + ret =3D socket->resource_ops->init(socket); if (ret) goto err; } @@ -220,9 +219,9 @@ void pcmcia_unregister_socket(struct pcmcia_socket *soc= ket) =20 /* 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; } =20 +static void socket_shutdown_helper(struct pcmcia_socket *s) +{ + guard(mutex)(&s->ops_mutex); + + s->state &=3D SOCKET_INUSE | SOCKET_PRESENT; + msleep(shutdown_delay * 10); + s->state &=3D SOCKET_INUSE; + + /* Blank out the socket state */ + s->socket =3D dead_socket; + s->ops->init(s); + s->ops->set_socket(s, &s->socket); + s->lock_count =3D 0; + kfree(s->fake_cis); + s->fake_cis =3D NULL; + s->functions =3D 0; +} + /* * socket_setup() and socket_shutdown() are called by the main event handl= er * 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); =20 - mutex_lock(&s->ops_mutex); - s->state &=3D SOCKET_INUSE | SOCKET_PRESENT; - msleep(shutdown_delay * 10); - s->state &=3D SOCKET_INUSE; - - /* Blank out the socket state */ - s->socket =3D dead_socket; - s->ops->init(s); - s->ops->set_socket(s, &s->socket); - s->lock_count =3D 0; - kfree(s->fake_cis); - s->fake_cis =3D NULL; - s->functions =3D 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); =20 #ifdef CONFIG_CARDBUS cb_free(s); @@ -396,6 +399,10 @@ static int socket_insert(struct pcmcia_socket *skt) =20 dev_dbg(&skt->dev, "insert\n"); =20 + /* + * 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; =20 - 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 =3D skt->state; @@ -446,20 +453,21 @@ static int socket_suspend(struct pcmcia_socket *skt) skt->ops->suspend(skt); skt->state |=3D SOCKET_SUSPEND; skt->state &=3D ~SOCKET_IN_RESUME; - mutex_unlock(&skt->ops_mutex); + return 0; } =20 static int socket_early_resume(struct pcmcia_socket *skt) { - mutex_lock(&skt->ops_mutex); + guard(mutex)(&skt->ops_mutex); + skt->socket =3D dead_socket; skt->ops->init(skt); skt->ops->set_socket(skt, &skt->socket); if (skt->state & SOCKET_PRESENT) skt->resume_status =3D socket_setup(skt, resume_delay); skt->state |=3D SOCKET_IN_RESUME; - mutex_unlock(&skt->ops_mutex); + return 0; } =20 @@ -467,9 +475,8 @@ static int socket_late_resume(struct pcmcia_socket *skt) { int ret =3D 0; =20 - mutex_lock(&skt->ops_mutex); - skt->state &=3D ~(SOCKET_SUSPEND | SOCKET_IN_RESUME); - mutex_unlock(&skt->ops_mutex); + scoped_guard(mutex, &skt->ops_mutex) + skt->state &=3D ~(SOCKET_SUSPEND | SOCKET_IN_RESUME); =20 if (!(skt->state & SOCKET_PRESENT)) { ret =3D socket_insert(skt); @@ -572,6 +579,48 @@ static void socket_detect_change(struct pcmcia_socket = *skt) } } =20 +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 =3D skt->callback->suspend(skt); + else + ret =3D 0; + if (!ret) { + socket_suspend(skt); + msleep(100); + } + } + if ((sysfs_events & PCMCIA_UEVENT_RESUME) && + !(skt->state & SOCKET_CARDBUS)) { + ret =3D 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 =3D __skt; @@ -613,39 +662,7 @@ static int pccardd(void *__skt) skt->sysfs_events =3D 0; spin_unlock_irqrestore(&skt->thread_lock, flags); =20 - 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 =3D skt->callback->suspend(skt); - else - ret =3D 0; - if (!ret) { - socket_suspend(skt); - msleep(100); - } - } - if ((sysfs_events & PCMCIA_UEVENT_RESUME) && - !(skt->state & SOCKET_CARDBUS)) { - ret =3D 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 =3D pccardd_helper(skt, events, sysfs_events); =20 if (events || sysfs_events) continue; @@ -663,9 +680,9 @@ static int pccardd(void *__skt) =20 /* 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); } =20 /* 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 =3D 0; - /* s->skt_mutex also protects s->callback */ - mutex_lock(&s->skt_mutex); + guard(mutex)(&s->skt_mutex); =20 if (c) { /* registration */ - if (s->callback) { - ret =3D -EBUSY; - goto err; - } + if (s->callback) + return -EBUSY; =20 s->callback =3D c; =20 @@ -740,10 +753,8 @@ int pccard_register_pcmcia(struct pcmcia_socket *s, st= ruct pcmcia_callback *c) s->callback->add(s); } else s->callback =3D NULL; - err: - mutex_unlock(&s->skt_mutex); =20 - return ret; + return 0; } EXPORT_SYMBOL(pccard_register_pcmcia); =20 @@ -759,35 +770,27 @@ int pcmcia_reset_card(struct pcmcia_socket *skt) =20 dev_dbg(&skt->dev, "resetting socket\n"); =20 - mutex_lock(&skt->skt_mutex); - do { - if (!(skt->state & SOCKET_PRESENT)) { - dev_dbg(&skt->dev, "can't reset, not present\n"); - ret =3D -ENODEV; - break; - } - if (skt->state & SOCKET_SUSPEND) { - dev_dbg(&skt->dev, "can't reset, suspended\n"); - ret =3D -EBUSY; - break; - } - if (skt->state & SOCKET_CARDBUS) { - dev_dbg(&skt->dev, "can't reset, is cardbus\n"); - ret =3D -EPERM; - break; - } + guard(mutex)(&skt->skt_mutex); =20 - 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 =3D socket_reset(skt); - mutex_unlock(&skt->ops_mutex); - if ((ret =3D=3D 0) && (skt->callback)) - skt->callback->resume(skt); - - ret =3D 0; - } while (0); - mutex_unlock(&skt->skt_mutex); + if ((ret =3D=3D 0) && (skt->callback)) + skt->callback->resume(skt); =20 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 =3D container_of(dev, struct pcmcia_socket, dev); - int ret; =20 - mutex_lock(&s->skt_mutex); - ret =3D callback(s); - mutex_unlock(&s->skt_mutex); + guard(mutex)(&s->skt_mutex); =20 - return ret; + return callback(s); } =20 static int pcmcia_socket_dev_suspend_noirq(struct device *dev) --=20 2.54.0