Date:   Tue, 11 Jan 2022 20:32:43 +0300
From:   Dan Carpenter <dan.carpenter@oracle.com>
To:     William Breathitt Gray <vilhelm.gray@gmail.com>
Cc:     Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= 
        <u.kleine-koenig@pengutronix.de>,
        Jonathan Cameron <Jonathan.Cameron@huawei.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org
Subject: [PATCH v2] counter: fix an IS_ERR() vs NULL bug
Message-ID: <20220111173243.GA2192@kili>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SnZctqTkXwIVf/kbg5VWtdwWVj32+EJiA8zlDW90rr0Mx5KyxtkgWgNniyGf?=
 =?us-ascii?Q?ptvfK0FDLDqU5+LZSC3kHfOdsw23lc9XP/x71/ozIH/I0IOAO3r3iNORmykg?=
 =?us-ascii?Q?Z35mdwHe7M8qVvDdrb1oXX+JeLKQK7QrfFzcq/BUm3TI/S7vkejYjh1K9eDM?=
 =?us-ascii?Q?0Ck8HHJwopiTjmzE+CRwU+m1EMdfzPV5LWcWS0dygSPj498YMC71ZDwOUnfK?=
 =?us-ascii?Q?UbzAqXceTw3FFVJZwZ4gDreLDCW8CO0a0YxVcSJldVqc6tUfKiHs2dkHDZld?=
 =?us-ascii?Q?8Bni37pLe6MQm2tShGfJDhSjUjxCvaEqX/XzCqQdI8FdJg8/HacluE1fakfh?=
 =?us-ascii?Q?pJNxHt2cY3AC26YJTZKcKtv6KYOA6CQ6JqpnGaUsKregXLQfxupbdX1i0WEv?=
 =?us-ascii?Q?V6hVBjuJBhdFgy16II8TVeHWzS8XuG8dqJzqXs8Y32CLDCQmiZOJIX1AURW+?=
 =?us-ascii?Q?WZEwTvWkjNh/WqwZOs3y32Yk8jNcOxtv4F6KCa0dMZhCKhODdfeilO44SIL/?=
 =?us-ascii?Q?vJHw3CZGGEhtb5a7+Ueli8VMuf1I8UVUPCKKHQyd7wULc2bQuJcCK4zpWh0M?=
 =?us-ascii?Q?YhmnhtK9oPdCZ8B9WOVeb42EdNa03j1BT2pOEIeJdk8zBYnlmSn/EPfxDFLr?=
 =?us-ascii?Q?zZlojviBMe6gBQytSgmvRla6Vpwhv0LxFuSNxnTQVMgQYfvIU/8Dg7+OrUbM?=
 =?us-ascii?Q?oybD7Hvcojw0LtwZC98a7cewZKqj7adxjQ5chfrBLEb6xPg/+Bgb1PpMXUrx?=
 =?us-ascii?Q?cOfkADeUvy6UxPs4gccPAzquCf9loU+T9JEkN1aucAYhqJsf0lhO/n+x3aqU?=
 =?us-ascii?Q?C29jW+vkyhfo5C39fL/N781Y/6/AzboZIBAowNi8xhFLT5WzB6GqT0+Ahv2X?=
 =?us-ascii?Q?TFku4cDF5tSV9wPxg6IFFJhEQ4QCUJ0kTW+cHoY2eCT2t7OLrolJA7JKuTib?=
 =?us-ascii?Q?MajrGpBfZ6kngJS02U4jA0jhNjrosd8kVH66XU7CWJGGn/Vt8pe9OozWioe4?=
 =?us-ascii?Q?+00qblYK9ZIOLy7emKMsAFmPxeinm2VsozETUiNUlVHXpYjaFVrDj9aEgH7A?=
 =?us-ascii?Q?2M+q2Eeh8iEJ5xyAd1rN/F44cbbFFKk7oWd/y1BpLZoUb/ANps6T2bhwHOc7?=
 =?us-ascii?Q?1EGRi2JuZbmjiEQ7xYuv/I694hOo5lga8TCwo6s3W6WLCRzS4ctN0Xbz0HXB?=
 =?us-ascii?Q?iF9NTEga3ks6uouNYCa+EqD5S4BIsRwfxjToDI2qo9ySgN/CV6Di28kVPMra?=
 =?us-ascii?Q?DsiNXDxIot3UKGZhI8KnM7e+5aBPP7rYAhK9wjYvOsZw+wrUA3evNz7Syq2o?=
 =?us-ascii?Q?FYN0T6UIdcaW6eJ99d4sCXcuJ8hZNPDrdt6HzddDd6FJwJCgz86D21di8gtW?=
 =?us-ascii?Q?kcbmvo3iEMnJtaFotr3UVm3YANRvPm5KvqDJlyaC2u5g0sSFS6wxmXlZ8oOi?=
 =?us-ascii?Q?69xUmzaVcH2D6TpU0WKiML2RLcbAbG4upkVnqi8p7LESGVUzjCsgUNgu1rAy?=
 =?us-ascii?Q?vn5l4mMRkIzthbv0hciDMKxcLyS1oKQYzpHaw/8rAN3BDlfeRHSxk7HX/rUe?=
 =?us-ascii?Q?2Wycmw/fs7HgHJPEoxhfQXNor1P8Dr+EgRlEGgwLETkSUhvzzwW063IvvJy/?=
 =?us-ascii?Q?FNlnXiAZQagOYJRpyA//YJ5H+MsldarEhDRCLqRfyghrfBsa7nI+vBnEcD4O?=
 =?us-ascii?Q?mlhxpsUkZYcTLC9r9MjhZXn5Yyg=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: bf96b445-9af7-4b11-7eb6-08d9d52868f6
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2365.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 17:32:58.7903
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: c6V3XG6YiDWFjfU2YhAEN51O12ltrquHW13R4JiNl6kB1gTJBxxF1ptxM2eA3PhRS25pJq2M3by/AQXZkYeiws4+ELOCSGkJw+Tk6KwssHk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4641
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10224 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 bulkscore=0 spamscore=0
 phishscore=0 adultscore=0 suspectscore=0 mlxscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2201110095
X-Proofpoint-GUID: B5dOGetowKCLKibcBmkm0pHe_g9njhUS
X-Proofpoint-ORIG-GUID: B5dOGetowKCLKibcBmkm0pHe_g9njhUS
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There are 8 callers for devm_counter_alloc() and they all check for NULL
instead of error pointers.  I think NULL is the better thing to return
for allocation functions so update counter_alloc() and devm_counter_alloc()
to return NULL instead of error pointers.

Fixes: c18e2760308e ("counter: Provide alternative counter registration functions")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: make additional style changes

 drivers/counter/counter-core.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/counter/counter-core.c b/drivers/counter/counter-core.c
index 7e0957eea094..869894b74741 100644
--- a/drivers/counter/counter-core.c
+++ b/drivers/counter/counter-core.c
@@ -90,10 +90,8 @@ struct counter_device *counter_alloc(size_t sizeof_priv)
 	int err;
 
 	ch = kzalloc(sizeof(*ch) + sizeof_priv, GFP_KERNEL);
-	if (!ch) {
-		err = -ENOMEM;
-		goto err_alloc_ch;
-	}
+	if (!ch)
+		return NULL;
 
 	counter = &ch->counter;
 	dev = &counter->dev;
@@ -123,9 +121,8 @@ struct counter_device *counter_alloc(size_t sizeof_priv)
 err_ida_alloc:
 
 	kfree(ch);
-err_alloc_ch:
 
-	return ERR_PTR(err);
+	return NULL;
 }
 EXPORT_SYMBOL_GPL(counter_alloc);
 
@@ -208,12 +205,12 @@ struct counter_device *devm_counter_alloc(struct device *dev, size_t sizeof_priv
 	int err;
 
 	counter = counter_alloc(sizeof_priv);
-	if (IS_ERR(counter))
-		return counter;
+	if (!counter)
+		return NULL;
 
 	err = devm_add_action_or_reset(dev, devm_counter_put, counter);
 	if (err < 0)
-		return ERR_PTR(err);
+		return NULL;
 
 	return counter;
 }
-- 
2.20.1