From nobody Thu Apr 2 19:13:53 2026 Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (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 2182A3264DE for ; Fri, 27 Mar 2026 02:02:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774576979; cv=none; b=V9o9ZPC+cNCsHvxe+5AbUM9pajRozYsBkytTODw5XafdaLXhb9T6CFdiXZz5LUbVkKislapKZFSqp3em/61iR8+geVbXfwVrlg+YcSdk1NzJH2Rnb2pZ8povkVOgONW3OM8vvHnd4hTzrsTWmDXvcMdeJYwVhaQoO6fiyef0hsk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774576979; c=relaxed/simple; bh=zg2VKuwFsN6029euqX1jn+gIisP3yKnPstGsmq0VUEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j6Rxf4CMhwHmDnz5P3ZUBStIO+v+0sJqM8sGKTV7Btz9tqbPI7gH58jfRRcNt6W6n6qfAejchiHXP2FRhcD3JxLePSlMS/edbjU4ku2wWP0Nq9VjFqpdsoTYNwu08vd8GmGpMW64A8EzbFFGPwdij4GhgyPqoYc8VnmZjAf4QH0= 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=abV6A38w; arc=none smtp.client-ip=209.85.160.182 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="abV6A38w" Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-509061dab77so14677781cf.2 for ; Thu, 26 Mar 2026 19:02:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1774576977; x=1775181777; 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=PihiyqdH9fgSKKz89FjkxG4uYpkRrGrjVrq6arvX1sY=; b=abV6A38wFRK8jjwEjo6u6Dys0TfULUO1y0ITjwTuI4dpKwkqeqtfAlzRKzCyq43k9p 83hGbtVBc6DL8jJwadwgmwhB19vn0BoehY69OqwzXYnWOKbb8AbEeWb03GtDKOEXetxQ 0L9NlE/UITgoW5V7Jjf6tROWy1OjzHdKk5wX/B4bDOh1Gn0o6IodF+Qspg3+/FRI3wgC 33za/j5XtinBJqiI7KgXPecfkWhS/zmuoNu7UF4pVvFoDFO93ohqwAqUdEZDHRGAStfX GerBohgwfkzIqTkWWVQRF923NaY4MfmjzeSFsFBCkyC+hyylrcupFdEnSb+xZMjsY4x7 cnug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774576977; x=1775181777; 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=PihiyqdH9fgSKKz89FjkxG4uYpkRrGrjVrq6arvX1sY=; b=X6J/BJoPLH1/bkOSD6A4UfFF3istQr41GjhOWKwjGB++UqAtWM76lcwV2qtvAkKumw Ess/ipuIfx7MxH1tG9FQnLGTFIZFErT2AnWZjh29NPMXKz1OYwbtkWiEajXu7iNGioyh ZizPn5zElE34LKj0tCgecifQR/gtbYbtXJ9zMOspStjZY7GEJeA7nm9kx7UsYwfSMqWC 8uRZXaQPlmymd5BO3cg0w/jU+w6OxwzL8Xu7bHqxtZOyzCnHXzHqUCcKz0OXVDOPDrXJ 5SH6oN3eF7EwAQOEaellnMg+mpXFAMGnn3uqjkoMR8VZfusZdBBQ0Lzfl8qu9Hq4gBMc ZGFA== X-Gm-Message-State: AOJu0YwOnaY6r1B8cMNAiECryCbPhJ62QX0ZJMQ6pfXEkocK7l0W/OOc hMoG3CGT5oPcWqudcpgVHUdRD8AszV3OPOyuv4yVcusNDQS+8uhXOm+t5TSSesNniEc= X-Gm-Gg: ATEYQzyaJF4UF2WOvgX1vXNP0H3bUdD1kwD+9cuPv5JXVNH0CRyyGbbwxZkmBJOFtTk eB1gNbJXIkhfFfsaBz1eigy/BU1M3bSYuniYuiaJ6qCdU7fz+BXNHggkVsZEqA3kT0ZUa0Sv1Xo 2nMupo4H8adrtqUBBnsw8aRtnsKXrisbzn+F5nt3mZ4KtaZg6NqQAhh2sg5P64xiD3wV4/ukezT YODAwp11x2BJiSwj8mtLCh2YWMb8HSo9JZLwCtXvGn278pYbHX5RqV+JeJM8R96Gco9rcT+u3Vf UPwFeJsxbUmpTff+eIEiHfsKx2mX2BBMZyjiihrMoQVTiQxva4mWcB5G2YRXAs3kRKL2uZTAtg/ DqNKi3VRurSMwsQFQiCdql9Et4pjZ382M4wNlS79bq56YpmllaR7vlzbnTjS3TL5+/z0+lXB3Zv LHXXzWW3E8wa5irRjzc/AjaxZtQlfZCC22NgI= X-Received: by 2002:ac8:5fc7:0:b0:50b:36af:56a6 with SMTP id d75a77b69052e-50ba383ebf5mr12273061cf.15.1774576977214; Thu, 26 Mar 2026 19:02:57 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F ([63.116.149.204]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50b923c0fc1sm39158901cf.27.2026.03.26.19.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 19:02:56 -0700 (PDT) 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 v5 3/3] cxl/core: use cleanup.h for devm_cxl_add_dax_region Date: Thu, 26 Mar 2026 22:02:03 -0400 Message-ID: <20260327020203.876122-4-gourry@gourry.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260327020203.876122-1-gourry@gourry.net> References: <20260327020203.876122-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. Signed-off-by: Gregory Price Reviewed-by: Ira Weiny --- drivers/cxl/core/region_dax.c | 13 +++++-------- drivers/cxl/cxl.h | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/cxl/core/region_dax.c b/drivers/cxl/core/region_dax.c index fe367759ac69..de04f78f6ad8 100644 --- a/drivers/cxl/core/region_dax.c +++ b/drivers/cxl/core/region_dax.c @@ -81,29 +81,26 @@ 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; int rc; =20 - cxlr_dax =3D cxl_dax_region_alloc(cxlr); + struct cxl_dax_region *cxlr_dax __free(put_cxl_dax_region) =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); if (rc) - goto err; + return rc; =20 rc =3D device_add(dev); if (rc) - goto err; + return rc; =20 dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), dev_name(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 f08be12e0e53..249a2f5ffc7b 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -712,6 +712,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.53.0