From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72F41171CE; Sat, 3 Feb 2024 04:12:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933546; cv=none; b=dg5MExECT3QypoexwvrwVSp7SgddQKTWgp0Pu7R0zJRxPNU+SCE0QqYqg35yyo7MlWKCdwdc2jN6SoDpo2Ty0yBYiMN+etYv3XofhEBqnVl1aa1JAA1BjIIy+QsWQV64EBacQAzSSViW5RDGwQVS5bqOBxh3xVpGR4OebbZ9qkk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933546; c=relaxed/simple; bh=dg19usXIXJKHT2hnZEiWqy1maUQezzyyb357f4h0x9U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pw/gWbxOuhbPR5K2M63XsCE5icokaP8/FcMWatTPXVvD11nJJGToQTCVQchHArrkI3OD3zvzc+s1r7QneYnTJT5Gksn9GTHB1t/alZuhgLe3TE34b7l1UKZRZQurFKv9uYCyWt3lC3rjCqCFv73Ako2i6o4efuML4p7YyB+IME4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LPpdsSTj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LPpdsSTj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37797C433F1; Sat, 3 Feb 2024 04:12:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933546; bh=dg19usXIXJKHT2hnZEiWqy1maUQezzyyb357f4h0x9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LPpdsSTjo3zuwDFlt0DP3t1C2wQMLfvSI/yHx2JtXs8XTlShQtZ5D9P5BWVTW6dA9 ZlQDVpVfNYL2wVmUGYV9/8Va/G6RaCYudE59xa1vYV2n/M700TQJPeifVB57qhEvo/ qGN2XeFEPlkeGkdQdPQV6NSjMM525P5KhEToIELg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Shevchenko , Herve Codina , Andrew Morton Subject: [PATCH 6.6 094/322] minmax: deduplicate __unconst_integer_typeof() Date: Fri, 2 Feb 2024 20:03:11 -0800 Message-ID: <20240203035402.187887587@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035359.041730947@linuxfoundation.org> References: <20240203035359.041730947@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Shevchenko commit 5e57418a2031cd5e1863efdf3d7447a16a368172 upstream. It appears that compiler_types.h already have an implementation of the __unconst_integer_typeof() called __unqual_scalar_typeof(). Use it instead of the copy. Link: https://lkml.kernel.org/r/20230911154913.4176033-1-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko Acked-by: Herve Codina Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- include/linux/minmax.h | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) --- a/include/linux/minmax.h +++ b/include/linux/minmax.h @@ -2,6 +2,7 @@ #ifndef _LINUX_MINMAX_H #define _LINUX_MINMAX_H +#include #include #include @@ -135,27 +136,6 @@ #define max_t(type, x, y) __careful_cmp((type)(x), (type)(y), >) /* - * Remove a const qualifier from integer types - * _Generic(foo, type-name: association, ..., default: association) performs a - * comparison against the foo type (not the qualified type). - * Do not use the const keyword in the type-name as it will not match the - * unqualified type of foo. - */ -#define __unconst_integer_type_cases(type) \ - unsigned type: (unsigned type)0, \ - signed type: (signed type)0 - -#define __unconst_integer_typeof(x) typeof( \ - _Generic((x), \ - char: (char)0, \ - __unconst_integer_type_cases(char), \ - __unconst_integer_type_cases(short), \ - __unconst_integer_type_cases(int), \ - __unconst_integer_type_cases(long), \ - __unconst_integer_type_cases(long long), \ - default: (x))) - -/* * Do not check the array parameter using __must_be_array(). * In the following legit use-case where the "array" passed is a simple pointer, * __must_be_array() will return a failure. @@ -169,13 +149,13 @@ * 'int *buff' and 'int buff[N]' types. * * The array can be an array of const items. - * typeof() keeps the const qualifier. Use __unconst_integer_typeof() in order + * typeof() keeps the const qualifier. Use __unqual_scalar_typeof() in order * to discard the const qualifier for the __element variable. */ #define __minmax_array(op, array, len) ({ \ typeof(&(array)[0]) __array = (array); \ typeof(len) __len = (len); \ - __unconst_integer_typeof(__array[0]) __element = __array[--__len]; \ + __unqual_scalar_typeof(__array[0]) __element = __array[--__len];\ while (__len--) \ __element = op(__element, __array[__len]); \ __element; })