From nobody Thu Apr 2 19:13:53 2026 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (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 EB3CB358D28 for ; Wed, 11 Feb 2026 20:42:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.196 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770842540; cv=none; b=GxYUfrOI4qoiqkne5H0CqMITyfdiZmtDQH5kwOltdIuu7ugKeOcjl41bpUp0PpQdA9ltHCiwYth1r+E8KQUHPjy3LY/RqUBqazZRc0qJYwkqk895AKf+9J8tAa31h67XfKgTmaok14ONlwNy4kRzHkJxppK1ilC0FWeLWW8yur0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770842540; c=relaxed/simple; bh=68gV8Gi8YJje3HgGHLLs6Vw7fYde7NjlI0jC39zIQkw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X2EpVD4tkSO94nHYtmrS4H8QTix7/bzfN2mtH8k9bO8+44a5XK2nBYneiDMXI0kltsoLGbGZGoHaTNRVtP+DrKT2nxzqD09SZoOPpHJnHfr14B39ZAd1wmSR701DaObxcBE472HAMFg5+bTGUt39nRtfPiYSmmIsYHK7SD0W8vs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=uJdbPfaG; arc=none smtp.client-ip=209.85.160.196 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="uJdbPfaG" Received: by mail-qt1-f196.google.com with SMTP id d75a77b69052e-50145d27b4cso82644871cf.2 for ; Wed, 11 Feb 2026 12:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1770842538; x=1771447338; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Bo4E78wtZDcFrMggw4PKgwdVgknKzbaZZjHKt3D2+6A=; b=uJdbPfaGuodW/9SNbEEXAnU124XmhA12Grv1PNyvgJpGOwOBNkFzINmtJOwmaf39Tg QEWPzeiXIS3HNmKfWIfE7Lyr+Sm+/JdUrzD8joeP6VugTLERlwQd3pQldszMOw5yXy8h mYeFzNzLP91fir3X0kw57BeGnzwBfzhVgYDkMT4G3tZmG2ncoSmxTkGqZ4QooPmGBCWS cvfHSH9m2ZnnyDRKDYzyZB770yyF35nDSKF7mjtXBfxjNoEQSphELI5cf8axH78E7eKH c8+ohrXaXlgOYwgz8wWBrqM1sRsc6+51RCFAebvh7TKEhIaa+KDmfK/YLOUHh69tZ6o7 QD8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770842538; x=1771447338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Bo4E78wtZDcFrMggw4PKgwdVgknKzbaZZjHKt3D2+6A=; b=JC5S4DZQOi0t369DXgpsv2oEcE189YfjMsj8hv/6iVC7dv4p2cxC5Fwi6HiYGfOxEv O1kbmcQSDtoMkiLE3IGs8m4pnNf02k6mmyefjMIBYj8OCTgoUzUiGQkospmwOU2ZY9ur 39GDkFFc10UlpBrGKxwrnv6GSY7SbjlkB6aBV+HLEL9xPPVGoVS42NOIh0e/2mee5j+r KEfAjHHLer9t7zbICdY8dPAcTbRW3loSoLiyqPgpb9HpvXB40dAFyA+ge8heR9lAa+AF hM3q/0rJeG44+7049QTw2HvmR11Ibbib8xT1GzIBtHInPJrBeZ06rEMaDrWyOeT8OLqb FHAA== X-Gm-Message-State: AOJu0YwLp/w1vmSVe9vnS8USVYUqVjPLhNcCYDU9xcJavUyJR58qT2D2 ZW6gIh0yfh88QHsBSPzn+IZXaTTydXuGfhfZOoxS0muVpGdVy/WR4J0Lx/TJktWYMbdvL/hrFpt 1q2BA X-Gm-Gg: AZuq6aJniKX/UeGMrgoSFdeSQV+BUDkdxUOe+v9jEsn/sjbqzj+zReaJ/Keoh/K1Gtl acx6bel+SASknL3Hb2T3Xx/CCAN5h1EipNO+EZtt2/ipQbm+ha/NEMP657d1nLnb3TAUMsDFvSt F8GABsPakLOOGBWCPmXpIO6RwTTcfI+BnGY/VJOscYYaM3iaO79Nn5dBM1AOT4gqH/i3Nca/afQ Auj+du/CZuG0q6VFwDg3wBF8h+IO7KBkQDyC5Std3eK8FZIlF5nKWLfF7srhegUCXh65nDUTNdc ORUBXNuV2fXEGfGf6YRa1YUuDSBspjUX+H6oKjOlAIy8IGGUDj0vDtUnsyITnH8DCIXjLecUCUq gM+uFKGRP2GMLZSWraMcEXtMwGym6LunZhyy9uJM49eAvoCULy29L5dNj8S+A8leukWyGzhxpJz hmC6yPizcQr7lw6vSobnGZtxl1QR86bS3v2u5xbxArB8KSe8RQb4qos4UjSCC6n3zW8gXbZbrJC uGM62Hsc8bWrCdDmTW7W+lS1w== X-Received: by 2002:a05:622a:1207:b0:501:b1d8:6376 with SMTP id d75a77b69052e-50691c7df39mr11461951cf.76.1770842537773; Wed, 11 Feb 2026 12:42:17 -0800 (PST) Received: from gourry-fedora-PF4VCD3F.lan (pool-96-255-20-138.washdc.ftas.verizon.net. [96.255.20.138]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-506847d77cesm20173591cf.3.2026.02.11.12.42.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 12:42:17 -0800 (PST) From: Gregory Price To: linux-cxl@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com Subject: [PATCH v3 3/3] cxl/core: use cleanup.h for devm_cxl_add_dax_region Date: Wed, 11 Feb 2026 15:42:06 -0500 Message-ID: <20260211204206.2171525-4-gourry@gourry.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260211204206.2171525-1-gourry@gourry.net> References: <20260211204206.2171525-1-gourry@gourry.net> 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" Cleanup the gotos in the function. No functional change intended. Signed-off-by: Gregory Price --- drivers/cxl/core/region_dax.c | 21 ++++++++------------- drivers/cxl/cxl.h | 1 + 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/cxl/core/region_dax.c b/drivers/cxl/core/region_dax.c index c8dd2bd1d9b9..49907c6c7620 100644 --- a/drivers/cxl/core/region_dax.c +++ b/drivers/cxl/core/region_dax.c @@ -81,29 +81,24 @@ static void cxlr_dax_unregister(void *_cxlr_dax) =20 int devm_cxl_add_dax_region(struct cxl_region *cxlr) { - struct cxl_dax_region *cxlr_dax; - struct device *dev; + struct cxl_dax_region *cxlr_dax __free(put_cxl_dax_region) =3D NULL; int rc; =20 cxlr_dax =3D cxl_dax_region_alloc(cxlr); if (IS_ERR(cxlr_dax)) return PTR_ERR(cxlr_dax); =20 - dev =3D &cxlr_dax->dev; - rc =3D dev_set_name(dev, "dax_region%d", cxlr->id); + rc =3D dev_set_name(&cxlr_dax->dev, "dax_region%d", cxlr->id); if (rc) - goto err; + return rc; =20 - rc =3D device_add(dev); + rc =3D device_add(&cxlr_dax->dev); if (rc) - goto err; + return rc; =20 - dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), - dev_name(dev)); + dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(cxlr_dax->dev.parent), + dev_name(&cxlr_dax->dev)); =20 return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister, - cxlr_dax); -err: - put_device(dev); - return rc; + no_free_ptr(cxlr_dax)); } diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index 04c673e7cdb0..0b59008ea45a 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -803,6 +803,7 @@ DEFINE_FREE(put_cxl_root, struct cxl_root *, if (_T) pu= t_device(&_T->port.dev)) DEFINE_FREE(put_cxl_port, struct cxl_port *, if (!IS_ERR_OR_NULL(_T)) put_= device(&_T->dev)) DEFINE_FREE(put_cxl_root_decoder, struct cxl_root_decoder *, if (!IS_ERR_O= R_NULL(_T)) put_device(&_T->cxlsd.cxld.dev)) DEFINE_FREE(put_cxl_region, struct cxl_region *, if (!IS_ERR_OR_NULL(_T)) = put_device(&_T->dev)) +DEFINE_FREE(put_cxl_dax_region, struct cxl_dax_region *, if (!IS_ERR_OR_NU= LL(_T)) put_device(&_T->dev)) =20 int devm_cxl_enumerate_ports(struct cxl_memdev *cxlmd); void cxl_bus_rescan(void); --=20 2.47.3