From patchwork Tue Oct 1 22:30:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 13818815 Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (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 5728A1CF2A2 for ; Tue, 1 Oct 2024 22:30:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727821850; cv=none; b=BYcvS/crNuWLF1CTgim+Mx2WzasojL+XOR/2PKHcK9vM95AqCaIoGImqMmTuxf+iL1tv4EjaFlCD7+UQOFLWMxT3JMWpR6qM4iC4XcI/Myr00YsJosSwCHkB6tMN8ZBEUKi+nnAzEbZEVyzvnrTb419Djt1CbUF1S9iYvmmyRtA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727821850; c=relaxed/simple; bh=JGTFl5VoZdw/HMSx+xMjDWjUeDuNOPJLXAn6T5BdJYg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=swLOsKtOgZHQvWu3j57xyzKsug2SKuCiAZ8JQdbW63IccUqRJVjutF9TODuTGmRSn1sHq74kvjN4f6C4jPylo1WDUghCtWA+ZY5iGMwKrW85kdx7Ikjc3YvjD6DWsANvdKycwRE+fLK9IuyQ1r7FJxtp+egfDcrGe6gC6HK1ka4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=npXPjI8S; arc=none smtp.client-ip=209.85.167.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="npXPjI8S" Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3e045525719so3798849b6e.2 for ; Tue, 01 Oct 2024 15:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1727821847; x=1728426647; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zQt8/ibZGmr7UQAMTn5RryHz2eZfh/xc9yurTJPgOaA=; b=npXPjI8SwU0So5l8m4ZN22qFUG5G5lrl0EmQJvjDGAMv1HD4W1YIGL+lxt7dk8ORkr +x5ztrLQI6JfDh/TTWOXO3gyT7ZHhRSFeoMG2dkmkDgv72S/JCG9NjYfPsP0cQEYjYcJ rjn4WFgKBtvDIHMN2h2LwDukfBnUbSTI9RwODUaA/6qu8vl6pfbSzW9WybkCdit2LAAs vcGfpZsqxryP/Kx8tkWrUipLgj8sQk7SYTYbqDTadMjcHjsoSwBGoDZd2x5daE18Zazl 55EG1RBU01GJqCAFBXuV5KmkEXNyS7cwC79go7xvJoWl3Q/JIESh0DIk/f/cJx38BB/d 8Dug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727821847; x=1728426647; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zQt8/ibZGmr7UQAMTn5RryHz2eZfh/xc9yurTJPgOaA=; b=cZn940lxJWAwuMMqeC5nJE0k3lv0K+JWrbogM1KVAExYo7oSjzljPvShuGwjUj6OgK 7U8qBf7iw/JYjmgibubAzY5MTmBziNWOatHiyXyddOyKr6M6u1jVfXzR+AiSJannfIpC Dd6aH3Rc1Rk2eDJ1l3TGn1GZboHPIQGMWY8NkDNHM1qtdXG4+Ych3FrU/MpSOYqEeoGH qjlKtAnGUJWqL+4WLwmzdjHDPql9N3liUqNqyIflWMfl6xPoM6LKB3N0W2c5OLVC53rh ZWITcgcz1f2c093R7eFKn5YkCCPDbDu5/mbuIdqYGezdn+FMohO0TmGjpEXzQ4A2/izs j5Ag== X-Forwarded-Encrypted: i=1; AJvYcCXguzRy7X8EBAetczWXa5YEIzNro335ZND7qmAP9Nxdi8iU1Jjl6OzSuzMPkY2Bl2YXqKSUSshTI74=@vger.kernel.org X-Gm-Message-State: AOJu0YzRWeXmv+8R0uXHEqbKnWizmPYLwGiSJg4uqPdaolpyvrJ50DNV kLvuYLOc79oSxYykOCnF76VzLx+6TZc7oWfuSHgQOfx4vwsihzdVjCENP7XYDWM= X-Google-Smtp-Source: AGHT+IGhvVHHB1hJmRFs6zxZiSrw/UPrPWpHoFtdU1cOKU7mjPFozjX8w0AobKNYjmXrmqNGa3i2Pg== X-Received: by 2002:a05:6808:1493:b0:3e3:b10e:c2c7 with SMTP id 5614622812f47-3e3b41879eemr1066223b6e.35.1727821847469; Tue, 01 Oct 2024 15:30:47 -0700 (PDT) Received: from [127.0.1.1] (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5e770eaa056sm3002097eaf.31.2024.10.01.15.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 15:30:46 -0700 (PDT) From: David Lechner Date: Tue, 01 Oct 2024 17:30:18 -0500 Subject: [PATCH 1/3] cleanup: add conditional guard helper Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241001-cleanup-if_not_cond_guard-v1-1-7753810b0f7a@baylibre.com> References: <20241001-cleanup-if_not_cond_guard-v1-0-7753810b0f7a@baylibre.com> In-Reply-To: <20241001-cleanup-if_not_cond_guard-v1-0-7753810b0f7a@baylibre.com> To: Peter Zijlstra , Dan Williams , Linus Torvalds , Jonathan Cameron Cc: =?utf-8?q?Nuno_S=C3=A1?= , Michael Hennerich , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-cxl@vger.kernel.org, David Lechner X-Mailer: b4 0.14.1 Add a new if_not_cond_guard() macro to cleanup.h for handling conditional guards such as mutext_trylock(). This is more ergonomic than scoped_cond_guard() for most use cases. Instead of hiding the error handling statement in the macro args, it works like a normal if statement and allow the error path to be indented while the normal code flow path is not indented. And it avoid unwanted side-effect from hidden for loop in scoped_cond_guard(). Signed-off-by: David Lechner Signed-off-by: Fabio M. De Francesco Reviewed-by: Dan Williams --- include/linux/cleanup.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h index 038b2d523bf8..682bb3fadfc9 100644 --- a/include/linux/cleanup.h +++ b/include/linux/cleanup.h @@ -273,6 +273,10 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \ * an anonymous instance of the (guard) class, not recommended for * conditional locks. * + * if_not_cond_guard(name, args...) { }: + * convenience macro for conditional guards that calls the statement that + * follows only if the lock was not acquired (typically an error return). + * * scoped_guard (name, args...) { }: * similar to CLASS(name, scope)(args), except the variable (with the * explicit name 'scope') is declard in a for-loop such that its scope is @@ -304,6 +308,13 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \ #define __guard_ptr(_name) class_##_name##_lock_ptr +#define __if_not_cond_guard(_name, _id, args...) \ + CLASS(_name, _id)(args); \ + if (!__guard_ptr(_name)(&_id)) + +#define if_not_cond_guard(_name, args...) \ + __if_not_cond_guard(_name, __UNIQUE_ID(guard), args) + #define scoped_guard(_name, args...) \ for (CLASS(_name, scope)(args), \ *done = NULL; __guard_ptr(_name)(&scope) && !done; done = (void *)1) From patchwork Tue Oct 1 22:30:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 13818816 Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com [209.85.167.173]) (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 3503919CC39 for ; Tue, 1 Oct 2024 22:30:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727821852; cv=none; b=ANR4B1Om71Q6oO1jJ1kjV5oGsmkUZSodUxeiIUkQxE1o5g7qMbqNL1wGfGVPtdDSe17bhyyWII+eNb+tucYV26J4yjuSiCuMq3mKokav1aiIi/8aHp7/1ua3EdfzTsBOkjIOQ839lDcW4S7BBxI154FEw8UapVZXRLxKffdDgO0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727821852; c=relaxed/simple; bh=yEmxUF8NvIZhxJNK3VZlTS7eTyiN+Ut8yjRJbZlxock=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nsw6JgTyW84bSyUlgt7arx5BocquAywGDzHTvbOk5OUbmEKgWMBu1z8vue+CvEdlW4pBPGjN2PYP8nRhLCZW7j8LsxqL1rYaP/bX5LHnrly96/Tq7TuxItdUmrUPeXl+D9CE5fT5PYjb+vkGBsunH9xdn2owDU+id43FigpNCB4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=aM/IKUO2; arc=none smtp.client-ip=209.85.167.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="aM/IKUO2" Received: by mail-oi1-f173.google.com with SMTP id 5614622812f47-3e03b6d99c3so2983238b6e.0 for ; Tue, 01 Oct 2024 15:30:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1727821850; x=1728426650; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=rpf61w6aK144lw1gfwbrMjBFwopIsPReXKSdcPJBI24=; b=aM/IKUO2mZ47JhOKG+XEVxc4/yjYb/WrSBVfs8PhBbcXvfLftZZ9PioyRk1QRUfh5Q PxI14cpa57I1oiBR87vuHYwB2hY/yToaDEeVgdSVBellPWWQY4WVskKrSR/FgLYQo1j9 4kr7RawAIcFQtjNdqVO0JA/O+S3CXptj/Ys/hWlXf/RjLEQUVOrtf7FyFh8NYVsOnQyB J5aJlT4WRU9lVplkrPYngIuOY/fUBxjlvjlyflsb+VLwKsPuLXfRE7Cj8tsyKYdHLHo7 kH01atRr2VDju1NBVynqVwSlP8N9HyhlNHsRQG/q/7xRJzJ75L7O2evzpSvejvLsQ9JS rP8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727821850; x=1728426650; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rpf61w6aK144lw1gfwbrMjBFwopIsPReXKSdcPJBI24=; b=sXmjIJ+4jm433e+XuavVYg8WWDuCK9tv7XcS9tuOJXTwB9UGJedQ4EghW+Og0NUXFn zaebNKFGC63Fx6QQOJyTbNSntYcw6YlGA9MVTlTH1VKiTVMKCkXfml0HBwmiRTVAR9kS EGu4G71tuYiH1M+zBSnGHAF30nk5bktqCYH2e5mslS7mKjUw174NPRgqAOu5psrDadTc m19n6Sgg+1GEkCDCp2IEN9zE2sqiFbO2o1BZNZnsP9VZs0O7HIUCzaAykhMwjGma8dkx EsTNXoDBgxInTCgNRm+bIUB5qxm94x9lKNzJNBzorttKJLyCZ8eoLQKQKf/98G0+/XUh h/eg== X-Forwarded-Encrypted: i=1; AJvYcCUui56Z4gC2ynMFEzauKMofVKTdSxOG0h5job4WU3MJEQKGLdzqAj8x7PRHpLswrvkA3BYqfS5VUso=@vger.kernel.org X-Gm-Message-State: AOJu0YyOf1AYOeynsJD/4RO71HQYqJdh5tUbWCVvOP9IB4zJ0Bbfd/oZ /YloOAeaxClrcGKpAEXIoc+GD3IQCVeD2wCUFst3zcVXKnJOmiCLLAOqEzcBBKg= X-Google-Smtp-Source: AGHT+IECe1/6DpxPJtyNlXLYmMWiHW8Lt0uF/1UH+h2LA80+tHG3gxfcLs3eXm7cgXnKvbptv7D51g== X-Received: by 2002:a05:6808:3009:b0:3e2:8be4:49da with SMTP id 5614622812f47-3e3b417b5b0mr1293101b6e.42.1727821850348; Tue, 01 Oct 2024 15:30:50 -0700 (PDT) Received: from [127.0.1.1] (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5e770eaa056sm3002097eaf.31.2024.10.01.15.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 15:30:48 -0700 (PDT) From: David Lechner Date: Tue, 01 Oct 2024 17:30:19 -0500 Subject: [PATCH 2/3] iio: adc: ad7380: use if_not_cond_guard for claim direct Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241001-cleanup-if_not_cond_guard-v1-2-7753810b0f7a@baylibre.com> References: <20241001-cleanup-if_not_cond_guard-v1-0-7753810b0f7a@baylibre.com> In-Reply-To: <20241001-cleanup-if_not_cond_guard-v1-0-7753810b0f7a@baylibre.com> To: Peter Zijlstra , Dan Williams , Linus Torvalds , Jonathan Cameron Cc: =?utf-8?q?Nuno_S=C3=A1?= , Michael Hennerich , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-cxl@vger.kernel.org, David Lechner X-Mailer: b4 0.14.1 Replace usage of iio_device_claim_direct_scoped() with if_not_cond_guard(). This makes fewer lines of code, less indentation, avoids having the error return statement in the macro args, and avoids needing to use unreachable(). Signed-off-by: David Lechner --- drivers/iio/adc/ad7380.c | 70 +++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/drivers/iio/adc/ad7380.c b/drivers/iio/adc/ad7380.c index e8bddfb0d07d..19a942035e93 100644 --- a/drivers/iio/adc/ad7380.c +++ b/drivers/iio/adc/ad7380.c @@ -569,15 +569,15 @@ static const struct regmap_config ad7380_regmap_config = { static int ad7380_debugfs_reg_access(struct iio_dev *indio_dev, u32 reg, u32 writeval, u32 *readval) { - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { - struct ad7380_state *st = iio_priv(indio_dev); + struct ad7380_state *st = iio_priv(indio_dev); - if (readval) - return regmap_read(st->regmap, reg, readval); - else - return regmap_write(st->regmap, reg, writeval); - } - unreachable(); + if_not_cond_guard(iio_claim_direct_try, indio_dev) + return -EBUSY; + + if (readval) + return regmap_read(st->regmap, reg, readval); + + return regmap_write(st->regmap, reg, writeval); } /* @@ -820,11 +820,10 @@ static int ad7380_read_raw(struct iio_dev *indio_dev, switch (info) { case IIO_CHAN_INFO_RAW: - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { - return ad7380_read_direct(st, chan->scan_index, - scan_type, val); - } - unreachable(); + if_not_cond_guard(iio_claim_direct_try, indio_dev) + return -EBUSY; + + return ad7380_read_direct(st, chan->scan_index, scan_type, val); case IIO_CHAN_INFO_SCALE: /* * According to the datasheet, the LSB size is: @@ -909,31 +908,30 @@ static int ad7380_write_raw(struct iio_dev *indio_dev, /* always enable resolution boost when oversampling is enabled */ boost = osr > 0 ? 1 : 0; - iio_device_claim_direct_scoped(return -EBUSY, indio_dev) { - ret = regmap_update_bits(st->regmap, - AD7380_REG_ADDR_CONFIG1, - AD7380_CONFIG1_OSR | AD7380_CONFIG1_RES, - FIELD_PREP(AD7380_CONFIG1_OSR, osr) | - FIELD_PREP(AD7380_CONFIG1_RES, boost)); + if_not_cond_guard(iio_claim_direct_try, indio_dev) + return -EBUSY; - if (ret) - return ret; + ret = regmap_update_bits(st->regmap, + AD7380_REG_ADDR_CONFIG1, + AD7380_CONFIG1_OSR | AD7380_CONFIG1_RES, + FIELD_PREP(AD7380_CONFIG1_OSR, osr) | + FIELD_PREP(AD7380_CONFIG1_RES, boost)); - st->oversampling_ratio = val; - st->resolution_boost_enabled = boost; - - /* - * Perform a soft reset. This will flush the oversampling - * block and FIFO but will maintain the content of the - * configurable registers. - */ - return regmap_update_bits(st->regmap, - AD7380_REG_ADDR_CONFIG2, - AD7380_CONFIG2_RESET, - FIELD_PREP(AD7380_CONFIG2_RESET, - AD7380_CONFIG2_RESET_SOFT)); - } - unreachable(); + if (ret) + return ret; + + st->oversampling_ratio = val; + st->resolution_boost_enabled = boost; + + /* + * Perform a soft reset. This will flush the oversampling block + * and FIFO but will maintain the content of the configurable + * registers. + */ + return regmap_update_bits(st->regmap, AD7380_REG_ADDR_CONFIG2, + AD7380_CONFIG2_RESET, + FIELD_PREP(AD7380_CONFIG2_RESET, + AD7380_CONFIG2_RESET_SOFT)); default: return -EINVAL; } From patchwork Tue Oct 1 22:30:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Lechner X-Patchwork-Id: 13818817 Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) (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 EB1471CEE94 for ; Tue, 1 Oct 2024 22:30:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727821855; cv=none; b=XFfhTwOSaDYPlTbGwGDTSRsE8OcqCstMOibXzZdSWJS84yA+L8ea77eCZG3TqdfRLa+BSYDIguoDDRRf9wcVGcA0oRcCzbbuBFdA0NyTRAE3/53jZukJRncnNEG3VBth5CwdbQcun+2P8sbIEZMWBuc/YDPdczCdG+1SI80hK9Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727821855; c=relaxed/simple; bh=V9Njp+Hss1MP7IhsB17a7/LmI6/c4TSAPkMBpdvoTI8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O/CcP9ToL892nv/vKfox+zHxi7RBYBzCKhDQmE2OWK+vgbE8xIYgb91kOo9ioNspH3SoQTNH+o03XjqOgKFPHoI04xaIseXe6yAk6jcJhEtn43zF+pc0wWjeHT7bC1jmeutJ9Pvn+EYE6wxJj6QuTEEqafuAKwsGkLDbgbMQpGg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=PTaISppF; arc=none smtp.client-ip=209.85.167.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="PTaISppF" Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3e04801bb65so3367939b6e.0 for ; Tue, 01 Oct 2024 15:30:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1727821853; x=1728426653; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=A9Sl44lq8X2WGm+oVf4+6IoQK0XVriOutR+vfMIV4VA=; b=PTaISppFa54EdVufO4rTjF1hU+hLTnfaBDct/jgGkOGPZRE60gyg9sn3vs6mDxFiup TuL8SJcZ4y72K0ubQfWqNSOct1/iBB9nM5mgiddpVNRZFJANsxDdEqUtyfF05Wvmz6iZ 4mi3gXxki0o2k7f3CIhqb21MY7O9EGB+9Uw/C3+9Gnzx7Tfq46G9/8QHezW561B566Nq mvpWWUilg2r1hlDdKwNuQg8bDtjf++w11ZwNpeOLu44cwUPmPJn08/uU/ZIh6M0yh9sK +NSX8Zh2EK3G7vN6Rtdmu0aWDj9zapKa9G1YvqMBn31oyRKJdcPKcqqPxcJDXeOs65Ki gPYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727821853; x=1728426653; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A9Sl44lq8X2WGm+oVf4+6IoQK0XVriOutR+vfMIV4VA=; b=Sw0F+pSDQ0yUnwiK0Npzry0VWpbnqYaxTnw8q3TZfR8uYfX32uYAMlK8bEDUtrp+SD XJgmF2BxLffZBGdJaOOskGZji/V49PYvP5q2AjoJnsMRCImkipXb/GjP5aj5gQONVyJa d8Bi29QxoimKuBHyVFjSKeXsnM69Dk4ICraJfb6bvCPozHIDKfVL5vqaWcH6i0es3WeQ 4QEi/se39CL7APk+ijEIalPPecrhktsYF+yZaA67tc7Tz7h1rSZ4W4dsg7TmSj9QZrD4 L0RTR9dWvMXbxFd3oBOncdinuLOtXoOY2IYOsRZ5KOt7e9X+MU4Ri21k3LWOVn4RBDcP iHDw== X-Forwarded-Encrypted: i=1; AJvYcCV/6tWLfqK/nTI9JkaL+gUN1suCi5Cs1rnXth6trhHoh/h9f8qSXCmawdzmyMAwbNCQr7XZAoKFKGw=@vger.kernel.org X-Gm-Message-State: AOJu0Yx3HuCz6897kQbtrYvwzHRg4081ERsorlOCpnjfacfmoSjoY1QM RAxOCCpb0OSmE0CgM2+hNL6UiIWz54EpxzyQpJn5TKcGO7fO69ts7zl/by/L6/M= X-Google-Smtp-Source: AGHT+IEN2pfHky00i0eXvdOYYGLR6DqqFZpSA+Qwe2ckMPGBiP2uT0h9yCZCjMfnku65naZhHJqcAw== X-Received: by 2002:a05:6808:3a15:b0:3e2:7b57:9930 with SMTP id 5614622812f47-3e3b41631b4mr1047352b6e.36.1727821853123; Tue, 01 Oct 2024 15:30:53 -0700 (PDT) Received: from [127.0.1.1] (ip98-183-112-25.ok.ok.cox.net. [98.183.112.25]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5e770eaa056sm3002097eaf.31.2024.10.01.15.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2024 15:30:51 -0700 (PDT) From: David Lechner Date: Tue, 01 Oct 2024 17:30:20 -0500 Subject: [PATCH 3/3] cxl/region: Use cond_guard() in show_targetN() Precedence: bulk X-Mailing-List: linux-cxl@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241001-cleanup-if_not_cond_guard-v1-3-7753810b0f7a@baylibre.com> References: <20241001-cleanup-if_not_cond_guard-v1-0-7753810b0f7a@baylibre.com> In-Reply-To: <20241001-cleanup-if_not_cond_guard-v1-0-7753810b0f7a@baylibre.com> To: Peter Zijlstra , Dan Williams , Linus Torvalds , Jonathan Cameron Cc: =?utf-8?q?Nuno_S=C3=A1?= , Michael Hennerich , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, linux-cxl@vger.kernel.org, Ira Weiny , "Fabio M. De Francesco" , David Lechner X-Mailer: b4 0.14.1 Use if_not_cond_guard() to avoid goto and rc variable in the show_targetN() function. Suggested-by: Dan Williams Suggested-by: Ira Weiny Co-developed-by: Fabio M. De Francesco Signed-off-by: Fabio M. De Francesco Signed-off-by: David Lechner --- drivers/cxl/core/region.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index e701e4b04032..e7c0221edeae 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright(c) 2022 Intel Corporation. All rights reserved. */ +#include #include #include #include @@ -770,28 +771,21 @@ static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos) { struct cxl_region_params *p = &cxlr->params; struct cxl_endpoint_decoder *cxled; - int rc; - rc = down_read_interruptible(&cxl_region_rwsem); - if (rc) - return rc; + if_not_cond_guard(rwsem_read_intr, &cxl_region_rwsem) + return -EINTR; if (pos >= p->interleave_ways) { dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos, p->interleave_ways); - rc = -ENXIO; - goto out; + return -ENXIO; } cxled = p->targets[pos]; if (!cxled) - rc = sysfs_emit(buf, "\n"); - else - rc = sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev)); -out: - up_read(&cxl_region_rwsem); + return sysfs_emit(buf, "\n"); - return rc; + return sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev)); } static int match_free_decoder(struct device *dev, void *data)