From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.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 4ADA031A56C for ; Mon, 23 Feb 2026 03:40:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818042; cv=none; b=OFCUzz6Baui7CLXil77XygGMfOAxH5azIxenFIwXIcN23DZpE8MEzyP2sDuTL2d+VypDxthAys4O3AnS03TsoIUyKsSRMSlhw5r/u/nmReTXtlqfTm93PooIPSyOELRTXcWVvzxJmDTykhrOiDnYWXRubMd7x+KdLDAPNbroSgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818042; c=relaxed/simple; bh=sDWsTv88uNZNG8DVEijwNX9kt3yghprkYLDYfMTz5tM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HKpQwLhtGZDdEM2paIy8qeVJjTZHCN4xCiEguh4lAF8dVBFt+fatuY3ZZDMU+9lAPgSDhNsIzNaleNnxhXOnP7ywajVTLsG/tjw0UVUElnltlWx2YwklSyZbP3M6ejiG8W3JY7s5ajd8UkaM6ui26GDiLbo8U3geGkjc8+4LVQU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FhueWI/r; arc=none smtp.client-ip=209.85.128.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FhueWI/r" Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-7984d31b895so402187b3.1 for ; Sun, 22 Feb 2026 19:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818040; x=1772422840; 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=CvozGr4YIm5H0IcWBMJeiTYmTx8u/Ce7mtaZnY7rBfA=; b=FhueWI/rfNIfguEf31UPzy0PwNAYmlAPBL+SJoxoTf5+C1OfbNB3X9dmLYmxhFDrlu OBIwzsksSEAjMJRZi5DDxKy+otF+nTbzHno0k0YUAL3v+GRvyXoh/k4ynBR7/ZriCzgL LrMHN5gFDBtRLJ9AlWWkC1Pd3J1g3OyW8Aaffxp+0SX59rZP47ObDe84VzgGsm+PMH0v ftYbGIDTvyX1uIZx7evlI3nfTtD8ivLWIFi9ex3HDVZiVLQGsXw5N0khD8cV6vKuqwcQ 7sirSbjaXO4Oi0KCJWhM6W3wXjQXj5F1HCix2j/zgWL/OIpTTKZTCzde0meSz0paLrZe 7xFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818040; x=1772422840; 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=CvozGr4YIm5H0IcWBMJeiTYmTx8u/Ce7mtaZnY7rBfA=; b=Tyl959QTOSTRupSpOHbn8gHtLay6SaT7Fdy8nlwjXZvcdyhbtcty2ikSHP0B3VtR1r Br/FOrTSsaHDgcnyR6YAW7RfoRGg9LyKwgVUFVkbkex7TA9SjrFmo1t1W+ApeDMt3hCI Mdxq1pstRxNX89KEnqJ5MVOO7pUrTmE+680AWN5SlPf6evdV4top1gCf6SWcOYpKTqWu GqeTRkIxxvw81TXQxc/ldfhdiO37D3vvlTCEvika2ea4uB84RNhcAAvfdYtdR0VafSAR Ml2DLOqDpYnC+XQ2X3qwhs6O3vo2/qjlKwglq+J6yNZS8ib3X9oqicdjFUPeMr+FlpB7 to6g== X-Forwarded-Encrypted: i=1; AJvYcCWlPeaHHPTPm88BLAfywR5g6Xk6TAUj6/uPOokbNh0WsVlPKw8o1oM+OtW/940YS4FDoxuc2HnEdFoGGyA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+NJhDVrQ4Yt/7LXiR3aqYZJd9ptXBk8jBzBAL4hT4C3w6Phaz 3sk/OSieEA/ejIMOck7bn9t80jZ2Y8dXZkQhANFoTko+EVFAlVHOGSOr X-Gm-Gg: ATEYQzzlJ7VejqRlqTz4bVHGU9MDvNklRXD9qy3ipQ3SIC+goy0Qy0G+vEeDEsxuEqM KaZ7MoT2hgTmhCbD7TPWc+PzJwOkgjN9RpGn++tppahkFV88cxQECka8+TQa3+afHALJDtZ81m8 BrD0tkJLuem7jzLbh071rFqOx9+efRyRCZF7z/S6Tvve+K3Wty6mIKkAj7wq1rYMVAlmWukYFEk 3HS+PJZoyZ9yPgZqZdYfRt5WKLkRGoawG1p5SkmDreUIaESXjj8XNTvfARqpw23ne2IFrj1L8AR quam2dPWtBxJ3sKjNMYvg5z/Re4qWartQULP2YpoGw5X3ILjFoQ9NU2WarYuoeMYijQBPlrotf7 meQfTuQAbQGhbIML8u8kfo/JbpBrXDG7rgw6pS1F3crFUI4OSuFkyF5KHkUL8nfN/dsp1ycYzvt EDliDGt1+bqet9q8YMu3V7Kjx8aKDdW/BpDgGSwIIZkI5BUx9FPIKodB64lwH/zvlUujlTgZ5sQ nJTqnydNwQpBmWQuiU1aB7r X-Received: by 2002:a05:690c:e3e2:b0:794:cf56:5bc2 with SMTP id 00721157ae682-7982916e2dfmr72703637b3.59.1771818040206; Sun, 22 Feb 2026 19:40:40 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:40 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ethan Tidmore Subject: [PATCH v5 01/10] iio: light: gp2ap020a00f: simplify locking with guard() Date: Sun, 22 Feb 2026 21:40:11 -0600 Message-ID: <20260223034020.27625-2-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" Use the guard() cleanup handler to manage the device lock. This simplifies the code by removing the need for manual unlocking and goto error handling paths. Suggested-by: Jonathan Cameron Signed-off-by: Ethan Tidmore Reviewed-by: Andy Shevchenko --- v5: - Integrate with Andy Shevchenko's cleanups. v4: - No change. v3: - No change. v2: - Make this a series and include guard() macro as suggested by Jonathan Cameron. drivers/iio/light/gp2ap020a00f.c | 110 ++++++++++--------------------- 1 file changed, 35 insertions(+), 75 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index c7df4b258e2c..7cee15db3a1a 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -31,6 +31,7 @@ * the other one. */ =20 +#include #include #include #include @@ -1024,17 +1025,13 @@ static int gp2ap020a00f_write_event_val(struct iio_= dev *indio_dev, bool event_en =3D false; u8 thresh_val_id; u8 thresh_reg_l; - int err =3D 0; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 thresh_reg_l =3D gp2ap020a00f_get_thresh_reg(chan, dir); thresh_val_id =3D GP2AP020A00F_THRESH_VAL_ID(thresh_reg_l); - - if (thresh_val_id > GP2AP020A00F_THRESH_PH) { - err =3D -EINVAL; - goto error_unlock; - } + if (thresh_val_id > GP2AP020A00F_THRESH_PH) + return -EINVAL; =20 switch (thresh_reg_l) { case GP2AP020A00F_TH_L_REG: @@ -1046,30 +1043,23 @@ static int gp2ap020a00f_write_event_val(struct iio_= dev *indio_dev, &data->flags); break; case GP2AP020A00F_PH_L_REG: - if (val =3D=3D 0) { - err =3D -EINVAL; - goto error_unlock; - } + if (val =3D=3D 0) + return -EINVAL; + event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags); break; case GP2AP020A00F_PL_L_REG: - if (val =3D=3D 0) { - err =3D -EINVAL; - goto error_unlock; - } + if (val =3D=3D 0) + return -EINVAL; + event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags); break; } =20 data->thresh_val[thresh_val_id] =3D val; - err =3D gp2ap020a00f_write_event_threshold(data, thresh_val_id, - event_en); -error_unlock: - mutex_unlock(&data->lock); - - return err; + return gp2ap020a00f_write_event_threshold(data, thresh_val_id, event_en); } =20 static int gp2ap020a00f_read_event_val(struct iio_dev *indio_dev, @@ -1081,23 +1071,16 @@ static int gp2ap020a00f_read_event_val(struct iio_d= ev *indio_dev, { struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); u8 thresh_reg_l; - int err =3D IIO_VAL_INT; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 thresh_reg_l =3D gp2ap020a00f_get_thresh_reg(chan, dir); - - if (thresh_reg_l > GP2AP020A00F_PH_L_REG) { - err =3D -EINVAL; - goto error_unlock; - } + if (thresh_reg_l > GP2AP020A00F_PH_L_REG) + return -EINVAL; =20 *val =3D data->thresh_val[GP2AP020A00F_THRESH_VAL_ID(thresh_reg_l)]; =20 -error_unlock: - mutex_unlock(&data->lock); - - return err; + return IIO_VAL_INT; } =20 static int gp2ap020a00f_write_prox_event_config(struct iio_dev *indio_dev, @@ -1163,32 +1146,25 @@ static int gp2ap020a00f_write_event_config(struct i= io_dev *indio_dev, { struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); enum gp2ap020a00f_cmd cmd; - int err; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 switch (chan->type) { case IIO_PROXIMITY: - err =3D gp2ap020a00f_write_prox_event_config(indio_dev, state); - break; + return gp2ap020a00f_write_prox_event_config(indio_dev, state); case IIO_LIGHT: if (dir =3D=3D IIO_EV_DIR_RISING) { cmd =3D state ? GP2AP020A00F_CMD_ALS_HIGH_EV_EN : GP2AP020A00F_CMD_ALS_HIGH_EV_DIS; - err =3D gp2ap020a00f_exec_cmd(data, cmd); + return gp2ap020a00f_exec_cmd(data, cmd); } else { cmd =3D state ? GP2AP020A00F_CMD_ALS_LOW_EV_EN : GP2AP020A00F_CMD_ALS_LOW_EV_DIS; - err =3D gp2ap020a00f_exec_cmd(data, cmd); + return gp2ap020a00f_exec_cmd(data, cmd); } - break; default: - err =3D -EINVAL; + return -EINVAL; } - - mutex_unlock(&data->lock); - - return err; } =20 static int gp2ap020a00f_read_event_config(struct iio_dev *indio_dev, @@ -1197,35 +1173,23 @@ static int gp2ap020a00f_read_event_config(struct ii= o_dev *indio_dev, enum iio_event_direction dir) { struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); - int event_en =3D 0; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 switch (chan->type) { case IIO_PROXIMITY: if (dir =3D=3D IIO_EV_DIR_RISING) - event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, - &data->flags); + return test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags); else - event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, - &data->flags); - break; + return test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags); case IIO_LIGHT: if (dir =3D=3D IIO_EV_DIR_RISING) - event_en =3D test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, - &data->flags); + return test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags); else - event_en =3D test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, - &data->flags); - break; + return test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags); default: - event_en =3D -EINVAL; - break; + return -EINVAL; } - - mutex_unlock(&data->lock); - - return event_en; } =20 static int gp2ap020a00f_read_channel(struct gp2ap020a00f_data *data, @@ -1385,7 +1349,7 @@ static int gp2ap020a00f_buffer_postenable(struct iio_= dev *indio_dev) struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); int i, err =3D 0; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 /* * Enable triggers according to the scan_mask. Enabling either @@ -1413,16 +1377,13 @@ static int gp2ap020a00f_buffer_postenable(struct ii= o_dev *indio_dev) } =20 if (err < 0) - goto error_unlock; + return err; =20 data->buffer =3D kmalloc(indio_dev->scan_bytes, GFP_KERNEL); if (!data->buffer) - err =3D -ENOMEM; - -error_unlock: - mutex_unlock(&data->lock); + return -ENOMEM; =20 - return err; + return 0; } =20 static int gp2ap020a00f_buffer_predisable(struct iio_dev *indio_dev) @@ -1430,7 +1391,7 @@ static int gp2ap020a00f_buffer_predisable(struct iio_= dev *indio_dev) struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); int i, err =3D 0; =20 - mutex_lock(&data->lock); + guard(mutex)(&data->lock); =20 iio_for_each_active_channel(indio_dev, i) { switch (i) { @@ -1449,12 +1410,11 @@ static int gp2ap020a00f_buffer_predisable(struct ii= o_dev *indio_dev) } } =20 - if (err =3D=3D 0) - kfree(data->buffer); - - mutex_unlock(&data->lock); + if (err) + return err; =20 - return err; + kfree(data->buffer); + return 0; } =20 static const struct iio_buffer_setup_ops gp2ap020a00f_buffer_setup_ops =3D= { --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 2DC94343D60 for ; Mon, 23 Feb 2026 03:40:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818043; cv=none; b=c12OJW2rHrHIPS8wtYLXHeedGsrFkE8t2sMbLqJzghilKpafh+bOkBMb48/tST3CDsesqYhGO2FJwcRiBBQFYWI/a85ysFlFNInBwC3O9h9yYisUb65bggaZcYtUxaWvLDSquKhGw6vWVubul45Jt/JXOcfaATk9tX3YRQ10hu4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818043; c=relaxed/simple; bh=MHTAdA0p3yx096g9IicyqQnRBWRyNknXQhvTuGz80UY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fZV2jcRS7uxLRiPfusOkcebRdQpTJlI1DFaN8sSpZd4qtT0TC7f4TmgzifyeRMGba1jfKsZc5X/87Pqpdhge1wtDEXxXkmPKiQEKfevT7c2ilVSAXWhD+KtB9fvgzPsd+4KcfIQXzopZ6mhlgCmjxEXbtn9r9Mo5WiNQMis0KhM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IFd7Upvl; arc=none smtp.client-ip=209.85.128.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IFd7Upvl" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-79430ef54c3so32626437b3.2 for ; Sun, 22 Feb 2026 19:40:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818041; x=1772422841; 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=QkUJsJ1p8D5fQxyBrpC9/cW9Unihi8QuVXvCcGPqhEk=; b=IFd7UpvlyUHKjivxiMrCBIX6IhI0Hb0NN1h61dpTvCdMF84n7qhdJ9qud98I7nh+dQ O/pepywlFa0h00wwcWgCUWnydX6daFetRSZgIoOeWmIOHciw5ru7N5H77McxbLR+l2w8 0ZXHzKQ1kK5EzILzAIieT9sd/+Mg+nAcI8TlwdIUlW0eVjrCZb/p4dYAfn4T4sZ/4M8w UoNowWi4hpMa/Z7CCWcKK9cINT3OZWCqG/pq48oRjoX+6+rcLHkuN9Wlny2+fSMBT2Pj T6tfQM1trEX/e7mIm9NHj5RfEkolyczZTMIm8olduhYKE2tl3htSKBPdXjMRkdImmCNA e28A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818041; x=1772422841; 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=QkUJsJ1p8D5fQxyBrpC9/cW9Unihi8QuVXvCcGPqhEk=; b=CdaWGCXk+EP7+Sql4UtTAn190QZvldmRU6EU94Bc6ppVFpXQlh7M3d1Zo3EYN2eh9O HurpVaXnTjxCMhnyynGd5qwH4sh1ZV13mIsLIgOQaGB/9sD17Bn8DWoLVLleKt3F8TvO BAyO4F3JLr2haDSidMG411DvNmqX49BfCcGevEnlq6lDHj/eReTI8kG2WX4FljZwREB/ wXOXe1fdyQJnvbYLfBxF+2naBZJrls1KanZOwpfzhEAJfnKMPLDio7Wnvupx2aI54twK FuvEnNA4pb21neqjTXMwqJXOCvBVUKpOZmR/ATseptNW7MBb12jCP8/llnGp4wzNRiv7 G6pQ== X-Forwarded-Encrypted: i=1; AJvYcCWFW9xlaitWP+JSM+ETz3tgkbobrUV7Stb7PppnRAZjcQSzqNjTvZB2NhXpNwAuzlHmwvu7Ht2rL1Hyqgs=@vger.kernel.org X-Gm-Message-State: AOJu0YxgUfNEBnXQ+6bkoyfsSXpP64+hs5Na3DIM4BCWwlag4u5PtqB6 szUZFXv4ASTVbqZP1haFQd0bSvEFZDSiQCwtPs4260buHNDHtEHPOzir X-Gm-Gg: ATEYQzyPl2hSBrxy8wmuEIWb/D8VO7Nyq86pD5z9sFDzlEQsUGKWvfkIrXDWXuUd2la LNqhO0VM0zQA/bF7Mfqmu/L0nD8NPbkDXTJtc5W6+B0ANvojh5wrvN/sZNTz9ze/HAJwd+3PLTC kSAa0K12qYOIhaxH3M0kzOMs3YZmiZhGtwGQqf6AMq9koCWhWNtkIt1UxMNayl7e+6z3cdbi+oN e9y8J9ZCCvH5M1cyadlsSQ5j6O7Z5BRnWodZ7d9g3PNXdwoN/8RwX00faNI1JIqLWHg51pCubTT PfFcqmXiNPEXzcbjuyeetrzgEWdnEw0WCSmy1FjBZkzNU8LiHzdFEaJkPd7ZHwZmRwQV35g5TPH oppIzSl9I8ZyKkUd12MD5TeXQPV+Z4/105YsCKS5Lp0V5Vg3wQrRgSJbszLwN16eM+bPEwW/noK jdKZnawaekWHVtRfWHw3a0ttCkBrnNOaKXX/eUP9zLmwitE01bZjLOmuWG8eLTiuJR2Kis49N/T s/Qq6VcMFzT/YhVZQbkNhnv X-Received: by 2002:a05:690c:ed6:b0:794:d80f:d035 with SMTP id 00721157ae682-798290489e0mr60364847b3.49.1771818041119; Sun, 22 Feb 2026 19:40:41 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:40 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ethan Tidmore , Andy Shevchenko Subject: [PATCH v5 02/10] iio: light: gp2ap020a00f: correct return type to int Date: Sun, 22 Feb 2026 21:40:12 -0600 Message-ID: <20260223034020.27625-3-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" The function gp2ap020a00f_get_thresh_reg() can return -EINVAL in its error path. Yet, the function has return type of u8. Added error checking for gp2ap020a00f_get_thresh_reg() return value. Detected by Smatch: drivers/iio/light/gp2ap020a00f.c:1013 gp2ap020a00f_get_thresh_reg() warn: signedness bug returning '(-22)' Reviewed-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Added Reviewed-by: tag from Andy Shevchenko. v3: - Remove Fixes: tag. - Added Smatch warning. v2: - Fixed gp2ap020a00f_get_thresh_reg() parameter alignment. - Removed unneeded whitespace between assignment and check. drivers/iio/light/gp2ap020a00f.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 7cee15db3a1a..6fe4486101b8 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -993,8 +993,8 @@ static irqreturn_t gp2ap020a00f_trigger_handler(int irq= , void *data) return IRQ_HANDLED; } =20 -static u8 gp2ap020a00f_get_thresh_reg(const struct iio_chan_spec *chan, - enum iio_event_direction event_dir) +static int gp2ap020a00f_get_thresh_reg(const struct iio_chan_spec *chan, + enum iio_event_direction event_dir) { switch (chan->type) { case IIO_PROXIMITY: @@ -1024,11 +1024,14 @@ static int gp2ap020a00f_write_event_val(struct iio_= dev *indio_dev, struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); bool event_en =3D false; u8 thresh_val_id; - u8 thresh_reg_l; + int thresh_reg_l; =20 guard(mutex)(&data->lock); =20 thresh_reg_l =3D gp2ap020a00f_get_thresh_reg(chan, dir); + if (thresh_reg_l < 0) + return thresh_reg_l; + thresh_val_id =3D GP2AP020A00F_THRESH_VAL_ID(thresh_reg_l); if (thresh_val_id > GP2AP020A00F_THRESH_PH) return -EINVAL; @@ -1070,11 +1073,13 @@ static int gp2ap020a00f_read_event_val(struct iio_d= ev *indio_dev, int *val, int *val2) { struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); - u8 thresh_reg_l; + int thresh_reg_l; =20 guard(mutex)(&data->lock); =20 thresh_reg_l =3D gp2ap020a00f_get_thresh_reg(chan, dir); + if (thresh_reg_l < 0) + return thresh_reg_l; if (thresh_reg_l > GP2AP020A00F_PH_L_REG) return -EINVAL; =20 --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.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 B88D3344059 for ; Mon, 23 Feb 2026 03:40:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818045; cv=none; b=ZYRoE4YoEvfMfoALQBLMKA0oyMTlf6AkH+C16n7t3qjJpbxTCWNwaDB2SzZbHbk0oabFDI3rLCbaI0FsHCApoA2CjhYfAy+FNlD3ehGU5He5KLzbzCIi/bGiBeAqL4GlJZifdqDlbyjXExF6xgCiTHx9G6K+E2vGKpIHKtdkmyU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818045; c=relaxed/simple; bh=SGTNQIHXd2l45qUTlPXuJMT7dV8mZHGFRewKet2Zehk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fUtGG5wssz8XpZaZIUpiKZBijdC4g7kSr8C/5fmbPFWzsyAxOIiUQ458CuH4NUATMkAn0aSgeufeWWTJ1C+OvWOUNOJjwW41aR9pXh5UGXZtALrePzi25QiIyOr32O1PNDf+y5WrC7FktHaV1FUfotfmWjaM0SdXJkk+RDDzXWA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lqhwtF73; arc=none smtp.client-ip=209.85.128.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lqhwtF73" Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-79430ef54c3so32626507b3.2 for ; Sun, 22 Feb 2026 19:40:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818043; x=1772422843; 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=llBR4+ajSqeSvY9ajnO7OKctHCvK1f4bcOFt4jCCGI8=; b=lqhwtF73E07gSl7/j5nOw3mqLKMzctgm7P3ztBCo5BowSpJqI+u3lEha28djHCgVNC c1RpVtG7OIja0FR4J4yWXQbamdo9TRjGlCDRItSbxdRc62EnJd4RlolTiWgbqGjnJDBI Nt/hbu3jGDJuHpO0uxQyMGiL7rhfXfdrGXTRJdw87JJwX8RzktuVmEnWudoUf5WJ4wJN SBrbbUBRXdYi4EpP82DUEp+E35gwpgzklbcmrO5vpjxMVV/nQM/UxH6yxpdKQSgjytOd 19BM3LxsTTufsncrAiTuZM4sqN6SzNilPKzgIyeGky76inCmUqzomZtuVXLP9mCpsEiH kk8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818043; x=1772422843; 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=llBR4+ajSqeSvY9ajnO7OKctHCvK1f4bcOFt4jCCGI8=; b=duIMPN0UiekrqHnCfn1g7vI0HCDm2Wi7NJMBQ1GMvzF4psFWXZi+ZEFOU2ckGru3jB Bmf1n7TTBOUu8WT228liPM0ga1vOLDr/UDNdi8C4YZKI1nCxB1/QBnx+j3THxH/I95bl YLzdtuqqLxWymZDTafdgNe2lA5wQLEkzgxe6tKoIJeM/8tHHodjNRru5SZ1WnRfhuJ8B C650twaKcMmqHK6NfGqye2JHvl9OR4HBH3uk9CZZg/va8s14/nf6N42lqO6depdG3r8C zS+ZrG4KdYtiXninV73eqGo1v3qsgj4APXyMicm9ePlP3hmtPD31yvsPeNBvNg0pm/np bHwQ== X-Forwarded-Encrypted: i=1; AJvYcCW4Tu2q9l+KizJia8F2478ttLBpLjb9SZFr6KU+NTpJwxGL/Ld7huG10WbbvB68my1WATdKInruA35bNPI=@vger.kernel.org X-Gm-Message-State: AOJu0YwTHFAgzC/6tv75Zi5S9QaWTgaM6QdfXV/5H2o9X9h4wQUojK6Y n9XZXSwgXmZKpFvAGRB0K2zbkN7Z/Dscv6Q7Pa+tY6Kj/JwZLxjqdg3f X-Gm-Gg: ATEYQzziXm17Zd0NSsxh1Fkk5o8i1y4M4JKjvl9W4yDPBgxjcLwNJuynO9Cf1s+t9bT 1GRugBVRGaFnsGUUbjRRclDui/DrpSBYOdZI/Fz988HVedP1YeMoaqlp16FzYS38H4RmF3ue4W1 xumyZHnDGBuI0iQU5MFzALTgenx0HZSgG0XkEa1ogAJh5sA/vmiaPUlAzAFzSvJPbydKefcagLl BzH9by1A+sh7fpMRa2hhaBOPd8qkimcwjlTB6M1KT1ycR0RO542Zm95VoRnN6fWykaQC/iBn5EC R7+VSp65EpGGS9PbHUiKHwreWDvFYC3FPG4R1yR3lZ/wEkbKLIM4LHSS/QgrBqrg/COPNB+3/Xp n5146I7VPUxs8NioOQ6ZFqLPsXxGQYj82QKgQ2VGwJTiUnMmJPyzV42z7GBMNOz7DQhn1Hkcwyh 6j9wzKRMkspBMaVJZQ+st0XmybPIU/xhesD7bMf9caRlI0dvAFLPB1pJ0DuHdd94rRM/3XO+1bR xh9arLzhEqJr0hN9ABgrVDUASX3lRfEXG8= X-Received: by 2002:a05:690c:e3e8:b0:798:270:fec0 with SMTP id 00721157ae682-79828cf8c2bmr59182167b3.5.1771818042816; Sun, 22 Feb 2026 19:40:42 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:42 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 03/10] iio: light: gp2ap020a00f: Use correct types for 16-bit LE data Date: Sun, 22 Feb 2026 21:40:13 -0600 Message-ID: <20260223034020.27625-4-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko Instead of using byte arrays and then explicit castings, change the types of byte arrays to be __le16 and update the endianness conversions accordingly. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 6fe4486101b8..8558c4c3ef7a 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -462,7 +462,7 @@ static int gp2ap020a00f_write_event_threshold(struct gp= 2ap020a00f_data *data, =20 return regmap_bulk_write(data->regmap, GP2AP020A00F_THRESH_REG(th_val_id), - (u8 *)&thresh_buf, 2); + &thresh_buf, sizeof(thresh_buf)); } =20 static int gp2ap020a00f_alter_opmode(struct gp2ap020a00f_data *data, @@ -698,18 +698,18 @@ static int wait_conversion_complete_irq(struct gp2ap0= 20a00f_data *data) static int gp2ap020a00f_read_output(struct gp2ap020a00f_data *data, unsigned int output_reg, int *val) { - u8 reg_buf[2]; + __le16 reg_buf; int err; =20 err =3D wait_conversion_complete_irq(data); if (err < 0) dev_dbg(&data->client->dev, "data ready timeout\n"); =20 - err =3D regmap_bulk_read(data->regmap, output_reg, reg_buf, 2); + err =3D regmap_bulk_read(data->regmap, output_reg, ®_buf, sizeof(reg_b= uf)); if (err < 0) return err; =20 - *val =3D le16_to_cpup((__le16 *)reg_buf); + *val =3D le16_to_cpu(reg_buf); =20 return err; } @@ -867,8 +867,9 @@ static irqreturn_t gp2ap020a00f_thresh_event_handler(in= t irq, void *data) { struct iio_dev *indio_dev =3D data; struct gp2ap020a00f_data *priv =3D iio_priv(indio_dev); - u8 op_reg_flags, d0_reg_buf[2]; unsigned int output_val, op_reg_val; + __le16 d0_reg_buf; + u8 op_reg_flags; int thresh_val_id, ret; =20 /* Read interrupt flags */ @@ -896,11 +897,11 @@ static irqreturn_t gp2ap020a00f_thresh_event_handler(= int irq, void *data) * transition is required. */ ret =3D regmap_bulk_read(priv->regmap, GP2AP020A00F_D0_L_REG, - d0_reg_buf, 2); + &d0_reg_buf, sizeof(d0_reg_buf)); if (ret < 0) goto done; =20 - output_val =3D le16_to_cpup((__le16 *)d0_reg_buf); + output_val =3D le16_to_cpu(d0_reg_buf); =20 if (gp2ap020a00f_adjust_lux_mode(priv, output_val)) goto done; @@ -967,17 +968,15 @@ static irqreturn_t gp2ap020a00f_trigger_handler(int i= rq, void *data) int i, out_val, ret; =20 iio_for_each_active_channel(indio_dev, i) { - ret =3D regmap_bulk_read(priv->regmap, - GP2AP020A00F_DATA_REG(i), - &priv->buffer[d_size], 2); + ret =3D regmap_bulk_read(priv->regmap, GP2AP020A00F_DATA_REG(i), + &priv->buffer[d_size], 2); if (ret < 0) goto done; =20 if (i =3D=3D GP2AP020A00F_SCAN_MODE_LIGHT_CLEAR || i =3D=3D GP2AP020A00F_SCAN_MODE_LIGHT_IR) { - out_val =3D le16_to_cpup((__le16 *)&priv->buffer[d_size]); + out_val =3D get_unaligned_le16(&priv->buffer[d_size]); gp2ap020a00f_output_to_lux(priv, &out_val); - put_unaligned_le32(out_val, &priv->buffer[d_size]); d_size +=3D 4; } else { --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.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 89E743446D1 for ; Mon, 23 Feb 2026 03:40:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818046; cv=none; b=EGxglG5lUyeGM6Mg5AnWpV+y3kLWCjKGwza9ePjB4uJupXao6aVA8Ee6KO2rFU+KPp/Q7Bh50sMA9QuYfHKwbITgG9o9PM2zaMb1aVDy0+15UcdBvbXM7Twc5uHco1BXzORfsU5iIm8qXH+OaWmavo4cJZOKWdeOtLDR5W8BrhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818046; c=relaxed/simple; bh=WhKpuE8b1REpDWRKAoZ9pUtxDhIb3YCRe8/Hvvpd8PI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dgy/ZgOgDjqKuqtimAPTZS/m+IlbgJog3g/GqJ6vcsX94+CbQs7/XJuTxhfQz8Bqm4ZD68Vr3lDqFGtvX6p4cTo4KLcdWx99e+pp/daXkQ2brOc7v8bSfLyi4fNxJDBk2TvOE7qNQ6X2CkvBTZR+Ea6maV0W7UzFuY/tY/Gyg9w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CzcR8MeY; arc=none smtp.client-ip=209.85.128.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CzcR8MeY" Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-797d6f934e2so36599147b3.0 for ; Sun, 22 Feb 2026 19:40:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818044; x=1772422844; 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=Inztnc/jQ9anU8XWvdZwdVw0U+roWoisz8AsRkpiLjg=; b=CzcR8MeY4cpsGvoWfFjmMKtQ/5B4ZI8q+Df8lo9301UoFJo3oVdRS8fq49XOuGDzXy fiaOFC5vXLh2yg5LwnWo5HjQmNzPm94wkP7t5IeSoT/32aqNHfcCusRIBaWNDxHMOgYd /dxwAZ69xDAx/T59gawUSrWTXLLOwPQTGX1d6DnxQo9Mk4vp9f1Ej6tJBg2FtRfjKCSl LHD3vRYukTNumRxaiOx4/xCYSdhzl8e6c7sS0EnOxNQgS6Jz4V5EKrZiam1h23bJ7w2h wA048pYSfPJ7POfF3AHlScHJoPGW3rVmhKOkVTyY04Hgo36E7597Y5vpL2UZDiabkiqE +rgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818044; x=1772422844; 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=Inztnc/jQ9anU8XWvdZwdVw0U+roWoisz8AsRkpiLjg=; b=a7pzRUnPViIOyHj2dFJgbtMyb6+B04jPMNijV1nsD8YBtoWAOFHIz0y8I4WaMBMV0x rNq1w60ZPQDPXRUTKWiufhCHatB+ZJYGGuQU1TqC4a3hSIJmo0NuYKia7bDiydzXJj0K UlzII/qnHm1LXUZROEi8R00fw9o/9ecpnp6I3x1ZRcMlMxnTHrV/6b9iCKYm0MIxKvda 6TilyOQTO3ulQAogssBAqHnGjbe45wI2g4GKFMc2xXOtbpG+kJarLIO6bj/nLQRA8IcC 6+c9QLPa64d2aq2dKUJnwTGqRAc3R/R94FSz8OIHNYEpTQVLgOZ8IwpnThcoH86bRAXK TkKw== X-Forwarded-Encrypted: i=1; AJvYcCVOU3oEEOKsGl8+TDo3SytV/waLhjfrYCPIHo0kf+TGZ8hlORNqw+XfRlPpbjqAOG11NsbOgleRUOZNdwU=@vger.kernel.org X-Gm-Message-State: AOJu0YwCTnOBxck/ZXA7vB0DtQflrhE8/QqklygpT+zsF3yePUebvOPd 0orNhbNQ66VlUi9LSOS6mV8QgQC3u5TpZ4wNmL+qghmkrtUbAt4bT4MH X-Gm-Gg: ATEYQzy8WoJrTjMj/iKQXr47N0e+tZKwEBiuiH6wjaoUWOxALWCUAr4sabYfezNrBFG c5Ns5qhBtY2S7K01vvC4PovKx01NJOqwHoeaTBEorettQ44p7pYPNR3MFXZqUElOU5hxDzSc91X c2wylOMeaMKY6KXP3/H0JGJKHda2pBLP/YLcTzxv+KbHj9vhngKo7wYERtIFpNbBEY22GP3qcZz jsQLqJtNV6BjvsgjScSOdtrPJ+Dwh9+cbZgQCGgzctUwGx9oBoILOY/dhH4mtp21R6jpN0Cc1Xh 1MSQ6mOp0R1eCY/OY7UTngMLq6lC+DvAZwv7EJpZ58DPrqSMBIKCwtZg24+M3fiqDbv0L1SKmdW 8urRR1HQEyhBHT4jsHd4SwRlRc3nRQxSjnVoh/E2Dr/KFsuzlOL0xHqeZRq2NFcpex0tXnviRAp fTN4zd2yT8FCV3MJ16RiZuZhrj63PksIrS4yCi476SJe9wdLlzoweuV1yu3LpsGKd+CAvGZn/cT hz643j/HdrjdQRL0K+74ryU X-Received: by 2002:a05:690c:9990:b0:797:afeb:de93 with SMTP id 00721157ae682-79828ef1198mr65599197b3.12.1771818043672; Sun, 22 Feb 2026 19:40:43 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:43 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 04/10] iio: light: gp2ap020a00f: Return directly from the switch cases Date: Sun, 22 Feb 2026 21:40:14 -0600 Message-ID: <20260223034020.27625-5-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko Return directly from the switch cases which makes code easier to follow. In some cases convert pieces to the standard pattern which also unifies it with the accepted kernel practices. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - Split patch up as requested by Andy Shevchenko. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 60 +++++++++++++------------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 8558c4c3ef7a..6b283b52698f 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -494,27 +494,24 @@ static int gp2ap020a00f_alter_opmode(struct gp2ap020a= 00f_data *data, static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_data *data, enum gp2ap020a00f_cmd cmd) { - int err =3D 0; + int err; =20 switch (cmd) { case GP2AP020A00F_CMD_READ_RAW_CLEAR: if (data->cur_opmode !=3D GP2AP020A00F_OPMODE_SHUTDOWN) return -EBUSY; - err =3D gp2ap020a00f_set_operation_mode(data, + return gp2ap020a00f_set_operation_mode(data, GP2AP020A00F_OPMODE_READ_RAW_CLEAR); - break; case GP2AP020A00F_CMD_READ_RAW_IR: if (data->cur_opmode !=3D GP2AP020A00F_OPMODE_SHUTDOWN) return -EBUSY; - err =3D gp2ap020a00f_set_operation_mode(data, + return gp2ap020a00f_set_operation_mode(data, GP2AP020A00F_OPMODE_READ_RAW_IR); - break; case GP2AP020A00F_CMD_READ_RAW_PROXIMITY: if (data->cur_opmode !=3D GP2AP020A00F_OPMODE_SHUTDOWN) return -EBUSY; - err =3D gp2ap020a00f_set_operation_mode(data, + return gp2ap020a00f_set_operation_mode(data, GP2AP020A00F_OPMODE_READ_RAW_PROXIMITY); - break; case GP2AP020A00F_CMD_TRIGGER_CLEAR_EN: if (data->cur_opmode =3D=3D GP2AP020A00F_OPMODE_PROX_DETECT) return -EBUSY; @@ -522,16 +519,17 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_= data *data, err =3D gp2ap020a00f_alter_opmode(data, GP2AP020A00F_OPMODE_ALS, GP2AP020A00F_ADD_MODE); + else + err =3D 0; set_bit(GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER, &data->flags); - break; + return err; case GP2AP020A00F_CMD_TRIGGER_CLEAR_DIS: clear_bit(GP2AP020A00F_FLAG_ALS_CLEAR_TRIGGER, &data->flags); if (gp2ap020a00f_als_enabled(data)) break; - err =3D gp2ap020a00f_alter_opmode(data, + return gp2ap020a00f_alter_opmode(data, GP2AP020A00F_OPMODE_ALS, GP2AP020A00F_SUBTRACT_MODE); - break; case GP2AP020A00F_CMD_TRIGGER_IR_EN: if (data->cur_opmode =3D=3D GP2AP020A00F_OPMODE_PROX_DETECT) return -EBUSY; @@ -539,16 +537,17 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_= data *data, err =3D gp2ap020a00f_alter_opmode(data, GP2AP020A00F_OPMODE_ALS, GP2AP020A00F_ADD_MODE); + else + err =3D 0; set_bit(GP2AP020A00F_FLAG_ALS_IR_TRIGGER, &data->flags); - break; + return err; case GP2AP020A00F_CMD_TRIGGER_IR_DIS: clear_bit(GP2AP020A00F_FLAG_ALS_IR_TRIGGER, &data->flags); if (gp2ap020a00f_als_enabled(data)) break; - err =3D gp2ap020a00f_alter_opmode(data, + return gp2ap020a00f_alter_opmode(data, GP2AP020A00F_OPMODE_ALS, GP2AP020A00F_SUBTRACT_MODE); - break; case GP2AP020A00F_CMD_TRIGGER_PROX_EN: if (data->cur_opmode =3D=3D GP2AP020A00F_OPMODE_PROX_DETECT) return -EBUSY; @@ -556,13 +555,12 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_= data *data, GP2AP020A00F_OPMODE_PS, GP2AP020A00F_ADD_MODE); set_bit(GP2AP020A00F_FLAG_PROX_TRIGGER, &data->flags); - break; + return err; case GP2AP020A00F_CMD_TRIGGER_PROX_DIS: clear_bit(GP2AP020A00F_FLAG_PROX_TRIGGER, &data->flags); - err =3D gp2ap020a00f_alter_opmode(data, + return gp2ap020a00f_alter_opmode(data, GP2AP020A00F_OPMODE_PS, GP2AP020A00F_SUBTRACT_MODE); - break; case GP2AP020A00F_CMD_ALS_HIGH_EV_EN: if (test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags)) return 0; @@ -576,9 +574,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, return err; } set_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags); - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_TH, true); - break; case GP2AP020A00F_CMD_ALS_HIGH_EV_DIS: if (!test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags)) return 0; @@ -590,9 +587,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, if (err < 0) return err; } - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_TH, false); - break; case GP2AP020A00F_CMD_ALS_LOW_EV_EN: if (test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags)) return 0; @@ -606,9 +602,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, return err; } set_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags); - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_TL, true); - break; case GP2AP020A00F_CMD_ALS_LOW_EV_DIS: if (!test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags)) return 0; @@ -620,9 +615,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, if (err < 0) return err; } - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_TL, false); - break; case GP2AP020A00F_CMD_PROX_HIGH_EV_EN: if (test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags)) return 0; @@ -636,9 +630,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, return err; } set_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags); - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_PH, true); - break; case GP2AP020A00F_CMD_PROX_HIGH_EV_DIS: if (!test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags)) return 0; @@ -647,9 +640,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, GP2AP020A00F_OPMODE_SHUTDOWN); if (err < 0) return err; - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_PH, false); - break; case GP2AP020A00F_CMD_PROX_LOW_EV_EN: if (test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags)) return 0; @@ -663,9 +655,8 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_da= ta *data, return err; } set_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags); - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_PL, true); - break; case GP2AP020A00F_CMD_PROX_LOW_EV_DIS: if (!test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags)) return 0; @@ -674,12 +665,11 @@ static int gp2ap020a00f_exec_cmd(struct gp2ap020a00f_= data *data, GP2AP020A00F_OPMODE_SHUTDOWN); if (err < 0) return err; - err =3D gp2ap020a00f_write_event_threshold(data, + return gp2ap020a00f_write_event_threshold(data, GP2AP020A00F_THRESH_PL, false); - break; } =20 - return err; + return 0; } =20 static int wait_conversion_complete_irq(struct gp2ap020a00f_data *data) @@ -1007,10 +997,8 @@ static int gp2ap020a00f_get_thresh_reg(const struct i= io_chan_spec *chan, else return GP2AP020A00F_TL_L_REG; default: - break; + return -EINVAL; } - - return -EINVAL; } =20 static int gp2ap020a00f_write_event_val(struct iio_dev *indio_dev, --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 03C4E3451B5 for ; Mon, 23 Feb 2026 03:40:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818048; cv=none; b=SB/Dzhchn04I7GdiiEyk0EJMsKIlO0pJd3T/EwcdT3RSQB9l7+cGwBq/5dlA1AKLD1jMx79ECyrq3AMYwz66GnoZOepSGy7Lkjt6lcvJspM0My3IK2tMWMSynjJeNP+AXThR1kPlty/hp5n0jbzltVTAd0YBllXZc4ROFe1OPhU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818048; c=relaxed/simple; bh=y8vKPCubDswMfiV1BDFc/WRWFhnkHJE3yofbqLmhM6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LgA3g5uKX+CLE9BddJ6mGFA7ea4fHjq/oGu8aY6Fq2Kz2ZgQfTBF7n7f3J/7fWa/iWFWjv/Kh7Myi6QRzKBJKEn7aML6mGUo9jCxiFrp9sfipWoMdyvabFDUKoVrWePVwPzHeevxMhj0QmQPwp9Lm847sZZIgOmMbC8Dgqp3TpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b8mX5vII; arc=none smtp.client-ip=209.85.128.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b8mX5vII" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-79801df3e21so35769697b3.2 for ; Sun, 22 Feb 2026 19:40:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818045; x=1772422845; 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=8IRh4rvJW/Bj1AuQS9zzQJnQDdzxOYm3yTJBXXZTfSk=; b=b8mX5vIIP7wKcZw256qO7AvO7PSjDBcxrlh0KGv+DMHChh4rUDLFhNgYXNEGwLHbhr DfI2REHoOAZvvBrIjN+X7cI3L4840+ieYMyhGbjQgUhib48WYgvN6F2Gbw1eKYH3Y4T3 vXpcsvohHIqu+TwByTsTHgNXzKC4LyM8J1p8n+CUCBX2pGHEWFb7uW0dSLKKKZNr70M8 lK5QKmgG7KWgLWpOu93GBlmhg87Mj4oEny13YNsIT2OfCsRiVblKch3Bu81CzD0j3i1t BS0Wtx/wPH0IjyAX+gefY5yutOSTF03kv2D3a0fmWcs1LCTVOFjnGh96cmry27c4wF1E s/zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818045; x=1772422845; 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=8IRh4rvJW/Bj1AuQS9zzQJnQDdzxOYm3yTJBXXZTfSk=; b=VdlEnBXQnyLn+5oWmutFti9x+40GXMvKo1Blcm2B8vOlrWwZIify5ecDqdnoZ4oUJd P8n3F4o+KF/BBc6zfQBkM0q8ZRZmO1zI6Bsv94A6pDMc506fsrFEXYTqtXw/joZC8qDt OifIHw6RU/yvDVCkIaluRZzPB9BQhYtqUXcOby2DMcBB8lxKnFse8uqSzwJvP73NJtke OtduOp213lYAbFs/AGBQ4Qp9baeYV23EobbzA3k3HU90pUfkgg4+F41NaNbbzY2pdAqv FEblitNBGNTHjwr/auq4Nu4KzMAgyYYxvIFfi6S+jSh8gI2RHYVs208SAR9TznJe89tD qLgw== X-Forwarded-Encrypted: i=1; AJvYcCUkjj50ppeIc6AemNdcjkZCEQhx3K8YemyTHB76EOy2YCweFKIMspDu6FWV7w5qQLz/8kg5330KoTE7AUg=@vger.kernel.org X-Gm-Message-State: AOJu0YzIF+Vda4F/U/7KLwMNZrE9ctjhKUZQxX9hgoRKG5EVBqvl/iju hyIUXpTNEx/osPMCtHqlWbnK54b/qaf2uwxxOnqieEAtFDiQpbwMuUhO X-Gm-Gg: ATEYQzx04uMzHQ+lWVlQk1kFvIzdWHOekJRDLgyGze/jLJGNHtXL6iPoZzeM7cc0KJR IYK/81H/Z9IA5YRZLIB8lKp0ASdwswOovr2fiwMFfiLeP3l1FiATOYeT55ayBTsrMPgYpjIwTte P98AInUACgtU5cadKOrDcKYMIcoJoWseRyEF0owy3aQax4MRDrFK6eKvBNL/yPMs1vbqJG+lK3j a4LH9K1gjmC+EO9wNRqnUbN1m5Pt3X6BE48X4tQQIrJ2Cey65hiotBS9wnznZlJ2tecsarEmYxU sksnMwBSxH5nJkZlqZysQlQIUolfnv6WtrCYc0gCtco9Gr1qAITGn3AIZde/JSFdwUKBaYl1qIX N8XqQvGvLd+f2GVA9J+NTpIXJ/2x/saoBm498M3vJLJHDuPtAhCt+bv/gTsEUFEErYCoxQ+rnIf kr5lot4U+zNE94H1XweeXHI3UrG0hMN1MgpRHK3bIOn0Dzz4Pj1yv/I7J2oteVHcvTMvZMzogyP gkSY+GoISr5T5Uxeblsm4Wp X-Received: by 2002:a05:690c:d91:b0:798:4fd:7211 with SMTP id 00721157ae682-79829028641mr65498377b3.45.1771818044901; Sun, 22 Feb 2026 19:40:44 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:44 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Ethan Tidmore , Andy Shevchenko Subject: [PATCH v5 05/10] iio: light: gp2ap020a00f: Fix possible error swallow Date: Sun, 22 Feb 2026 21:40:15 -0600 Message-ID: <20260223034020.27625-6-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" Move error check into for loop in gp2ap020a00f_buffer_postenable() and gp2ap020a00f_buffer_predisable(), this fixes a possible error swallow. Suggested-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - Split this patch from the patch number 4, to keep bug fix separate from style fix. drivers/iio/light/gp2ap020a00f.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 6b283b52698f..d2156e133b75 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -1339,7 +1339,7 @@ static const struct iio_info gp2ap020a00f_info =3D { static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev) { struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); - int i, err =3D 0; + int i, err; =20 guard(mutex)(&data->lock); =20 @@ -1366,11 +1366,10 @@ static int gp2ap020a00f_buffer_postenable(struct ii= o_dev *indio_dev) GP2AP020A00F_CMD_TRIGGER_PROX_EN); break; } + if (err) + return err; } =20 - if (err < 0) - return err; - data->buffer =3D kmalloc(indio_dev->scan_bytes, GFP_KERNEL); if (!data->buffer) return -ENOMEM; @@ -1381,7 +1380,7 @@ static int gp2ap020a00f_buffer_postenable(struct iio_= dev *indio_dev) static int gp2ap020a00f_buffer_predisable(struct iio_dev *indio_dev) { struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); - int i, err =3D 0; + int i, err; =20 guard(mutex)(&data->lock); =20 @@ -1400,11 +1399,10 @@ static int gp2ap020a00f_buffer_predisable(struct ii= o_dev *indio_dev) GP2AP020A00F_CMD_TRIGGER_PROX_DIS); break; } + if (err) + return err; } =20 - if (err) - return err; - kfree(data->buffer); return 0; } --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com [209.85.128.175]) (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 63D73345743 for ; Mon, 23 Feb 2026 03:40:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818048; cv=none; b=nj827RoBib5QnrFiMIk5ws5nqjRtpVfbXz+CTdNevPE2mojegP34ZXsmDhfR4j5K4BRpvW0MnCg/QSpXPXfSSYiCAcxkvVGf4vUQV1V3c6PlUZgCkQf2Ws51WHNcw/QPE1jW/LC6h+RQrsAbpsjTwn5Bb05FJb36QmczzLoU0FM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818048; c=relaxed/simple; bh=I485GX0Pog1oelKG+Cg/Ejzrxtfwd894VBCKnHl1O+s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rxIw6MPbbPz2fd6ntIWgKuypN5mQfxVbw0PS1uhTFgqeWWqkTgaoc4NcNUeeLhmktoi8Eib/1MTrFUlS9iWFLJ9KTN/+9vZzaHkYfeOrVGtGbxvg+KhU/YBBUqtzugdUhxvUCDeWFVi9DyBpK9RKwdv57WpwpfwZwyZYW7wZTf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eqA4azGQ; arc=none smtp.client-ip=209.85.128.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eqA4azGQ" Received: by mail-yw1-f175.google.com with SMTP id 00721157ae682-797ab169454so35354677b3.3 for ; Sun, 22 Feb 2026 19:40:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818046; x=1772422846; 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=pCgYbsV8y/lXIHufgVowxyqz38jANK3ZckW9ccKdzyk=; b=eqA4azGQV5dumcrWYZCLN6rIVTKbb7O68xE/jYkNx6UAOOj6u9jN5kzYBaxS1tw757 pVhlqab2gm0mTY3QNH6D2IR5ORTdOtFMi4aH2WIEOmkF1i5c11EWjY2y7RCjtpv1XykB yrtkVhi1izRpPHHPHTwYWdBQjtMSBxnkXOjf7PYGM/44DA7EIp+s6Gb+L8oDbrUA8Fgj tE+bkJseoe/fm/LUATjS+VxUvbu6QRj9Kif+OeX/LO0XiOeI58HsGxaQj/AljxExhHTy 2543eTc2nm6K5UBF+g8x43dZqMkfqL4Bj5K8Py1HFr22kBa/AfYNVIs9Xqnv7PUPzzxi W1BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818046; x=1772422846; 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=pCgYbsV8y/lXIHufgVowxyqz38jANK3ZckW9ccKdzyk=; b=j4g+hKhTQWOsoE1ofrKu4jMNBA5CdpPhgTNBfPT2QxFuwDHnXKedVYamSdcKWEZn0R XqzjJnqk3qNOhM0eJKCky+js6utYMiwbGrhbJO1iJ1sO99lQ2yMI+gzdFiNvhnN7ax9d 1xvCU6pEcwe9oMN3232J2UM4XLEb7Gr4G8srRfNpCnXq0LBlRMJ2NLCtNb32fN3Zv4LL IsOXNlwjxvOBDqNuB6sgiMb9nn5U4EAjrpOxmdJ1uISx4CKVBXaO4nK3LvW45ezQ5WRB E6nLNKthd/iREuImHRMkVkOyKcljf2YS+CEI/PTeOr1Cume3zvDumShvmhUOqf4hau+N 3UiA== X-Forwarded-Encrypted: i=1; AJvYcCVsw+rTGoBAPF1R+BxDLoWK4hqDXo9Zvp2Qei+mBq573FOKenlcdIfu7vp+JkDP9IOYrn7071/rBW+BiK0=@vger.kernel.org X-Gm-Message-State: AOJu0YxB5w/Sbwq7VDxqhp+aV8QZrn+6oDZccB969S+HM3eHVV/Tm03u tQpnqhbvCc/cGN4LBI9Y40lpvl3OOSguYs7YwoG1UPLgFoWdRGvJ2wcj X-Gm-Gg: ATEYQzzoHKWYlDrn9sCpEVfpldBtlIFJf1GcPDwO1C63Fj1eddBS5C4lF4OTuUTXVwW JAZJSrLNNbwKvohCs40CLCTE7DT4kYp8ECEvtEqrnc/Sq8ur5GBWyJAMuhB7bsEV26VcOProkkG YeLOqP26ruWQpgYK2bZIPwzhTM2j/XZgOP8PHkI3RVZjMigIYMyT8yrZC6ddX8MBjSQn1lF7aH5 3TxGxUcdbBYVaHC6BqLHggr1DVTS/+WU0+DSohws2VUZtjjJMUDv+YCTZOeIeMNlD8OqeZdqpUj 76CM15o0I7cW3JepQ5fG7ULOTEJ1MYaXRYRcWWIIUNvIedAtxoHoQv0w+EQdDszyOYlWOtyA4w5 ApPFGrCZeQ1jX+hzEjtIMXDSteSJNEtRF6wF+/5AA0dthH7vnR7C1VFU+ef9bUmnRMkna9F723g YJCLwwHzrIgJUvE66sCUeiFv0F1ysia8HAMH/6ABKcdIlJ4RFoveaROxe/OBcRzLOWPyl9zaULB 4Vfc1D1iSQV3+hjNiEpCJ8a X-Received: by 2002:a05:690c:6706:b0:794:8d58:cac0 with SMTP id 00721157ae682-79828eed47cmr62376017b3.16.1771818046404; Sun, 22 Feb 2026 19:40:46 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:45 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 06/10] iio: light: gp2ap020a00f: Replace custom implementation of min() Date: Sun, 22 Feb 2026 21:40:16 -0600 Message-ID: <20260223034020.27625-7-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko Replace custom implementation of min() to save a few lines of code. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index d2156e133b75..b2434d00e10a 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -45,6 +46,7 @@ #include #include #include + #include #include #include @@ -454,9 +456,7 @@ static int gp2ap020a00f_write_event_threshold(struct gp= 2ap020a00f_data *data, */ thresh_reg_val =3D data->thresh_val[th_val_id] / 16; else - thresh_reg_val =3D data->thresh_val[th_val_id] > 16000 ? - 16000 : - data->thresh_val[th_val_id]; + thresh_reg_val =3D min(data->thresh_val[th_val_id], 16000U); =20 thresh_buf =3D cpu_to_le16(thresh_reg_val); =20 --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 5D764344059 for ; Mon, 23 Feb 2026 03:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818049; cv=none; b=jCiTiLwKJYX9hD55Th8ELRfkipqNi+ACBhfLk9+Dy22G/eGUHL/Y7ooZ2uflS2hiOovX2GAdTiiYDqDosddymAZ3PvQ27XGj9gRfVoKKyTDaymkFrDsAFrOScwpNIuPt8Ox53jZsiwdXcTQq+dlKnRx4IWOor0RJtlpam5xzwQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818049; c=relaxed/simple; bh=u8tJfTiMhFLOgBGY/qJjB7+tG3jV629MS3lZouBe+Tc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J3/hmwVyjJRoLAISMJ2CnZw2ruQV7UtC3EqbMwUQUd55M3Ay/uYbQdXADGdvNg5VFMEBnVpAcewiSpsZQACckEY3KuevBupbQOdrzfRAuzHEtli2PdkI1A/q/puCHC9LwlWn8xvvjVx+BPyrR/j2Vn6kqSSYqRqLmwcCJmxMTgg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b0qPSCR1; arc=none smtp.client-ip=209.85.128.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b0qPSCR1" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-79495b1aaa7so32050817b3.1 for ; Sun, 22 Feb 2026 19:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818047; x=1772422847; 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=SFIDfb+fiqqkIYg8UaViqwuxTwVr1uGT5nI/+TRKG8o=; b=b0qPSCR1SV1AG21ZNatWXh3e8QLSAIdlWXaQDSD3YSVBxGuUig5uqjr6dBCWV8+OhV K+NxlGwBf3jjSRzMu5XUCB2sSRAUBk7Bged7NKuXXdkDwX/G4BciR7ka1Dk6ULTqC16C i/EJtUT84h7g+g2zlBlHNaoz1gsYwGkr8BzaLuTVc9hZUen4gEsbnq+XAHW+XmLxutxF NrPkUltgufXV83gs2AcTY6w5ojq0SdhRreNOQDUouJwuot2Zy6dBHbJ6Bot+55tImsb0 uu2+vrVw0ctU0wkO4nkkRwhUAtME6CqAwLB3PCL2GgstbrMWGJ/O+Q1WegV4Hgr5lrGx tHhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818047; x=1772422847; 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=SFIDfb+fiqqkIYg8UaViqwuxTwVr1uGT5nI/+TRKG8o=; b=nuBxsEcqbQDiqAhHGQc2rIkQgezshir9rkrdme6Q+vNx0oGnYIzSbhELp4fPqLnm6H +uobxVHrydGrWUb3yW3E7koMJymOns6UlVa6GLpN/u2n/z/pU8sq21OMs6Lb+7tf0qqS e8Y16FAvCXujSxqtnKFwpnZqu5ndTkbHCQRBq+sQqkHBNtOjXBYyylGfEyMNELp+wdXT mS3vUm8yQ+augUOigJR/2bxemdHLsC09VKyESpQA15OwmiWwYI9IXsd1AVIElVKIQvX3 0/8TcvWOk1rCBLJly/D0pBWhQu0UIdxG3puEHNejrMgVajU9GMM5ESgCRo3ntjL1BKX3 Y2dg== X-Forwarded-Encrypted: i=1; AJvYcCVTb4OFN7mx4KcfB2JeFZ48KoDVPqqikpcz4u/haEoBn9SBbzwxrPGyXdYXwbQzpuq104/CgHPFgM56blY=@vger.kernel.org X-Gm-Message-State: AOJu0YxhNRglkQVL7w1kMypbmZf5GaOHhts9LHRnREVCqPYs3XMR6v/9 9cwIiP5RhMt1J7lX9jaGax/7/8LOCVjPLKFBN+vUPMbva71AQ70GVHxc X-Gm-Gg: ATEYQzyFUxzy/FMnb0jSBIrDGMcG0zb8TRSjY+r3T8J0yBC26h+xqESNFOCqWYpTHPt fNvIUhlE6y2qPskp1gnAsmlq3YWY8jGqpopu3+kTMKYRJ9db8vn5D/3DZ8D/1tfFIW+fDJHTvbR vc4JZScl3cFEqgkz6NoeCSKU64lKUrJ05zKa+WhVYJiBXQdQhZJan7IZoU3wpVK1kIc2rzT8GND CcgYtNumm8bhgWXL2l/KaJtls6zeSp582FicKqUciTg5pNHkHxz0fSb3/9xB55Ff7xKrEPCugWZ j3uOMGoog1wbb5gZZqoEBO+WRfdq9e5Uqg/qkK89V1I7dYGLHPQmMAelZ2K3IsJVbUd5X3PAOgH PDKaadxV3CODtcSq55d/4DL/27CGTDkZstwl2hd/8B2MJdbImllWys8PzmAQEcQZeoIbeBbD1+z fholtixXLTII0I2oQG3u3oy2rXfTP9+JV4Aw/S33JCDtJ+qO2LEsBOZvVZtirq7NhedRrBcTwOM 7PyrRWaLSxAToajGv25rNYC X-Received: by 2002:a05:690c:a92:b0:797:df7c:3e1b with SMTP id 00721157ae682-79828ef29afmr63385657b3.4.1771818047348; Sun, 22 Feb 2026 19:40:47 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:46 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 07/10] iio: light: gp2ap020a00f: Use temporary variable for struct device Date: Sun, 22 Feb 2026 21:40:17 -0600 Message-ID: <20260223034020.27625-8-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko Use temporary variable for struct device to make code neater. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 34 +++++++++++++++----------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index b2434d00e10a..97630ce9ade0 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -1187,6 +1187,7 @@ static int gp2ap020a00f_read_event_config(struct iio_= dev *indio_dev, static int gp2ap020a00f_read_channel(struct gp2ap020a00f_data *data, struct iio_chan_spec const *chan, int *val) { + struct device *dev =3D &data->client->dev; enum gp2ap020a00f_cmd cmd; int err; =20 @@ -1206,27 +1207,23 @@ static int gp2ap020a00f_read_channel(struct gp2ap02= 0a00f_data *data, =20 err =3D gp2ap020a00f_exec_cmd(data, cmd); if (err < 0) { - dev_err(&data->client->dev, - "gp2ap020a00f_exec_cmd failed\n"); - goto error_ret; + dev_err(dev, "gp2ap020a00f_exec_cmd failed\n"); + return err; } =20 err =3D gp2ap020a00f_read_output(data, chan->address, val); if (err < 0) - dev_err(&data->client->dev, - "gp2ap020a00f_read_output failed\n"); + dev_err(dev, "gp2ap020a00f_read_output failed\n"); =20 err =3D gp2ap020a00f_set_operation_mode(data, GP2AP020A00F_OPMODE_SHUTDOWN); if (err < 0) - dev_err(&data->client->dev, - "Failed to shut down the device.\n"); + dev_err(dev, "Failed to shut down the device.\n"); =20 if (cmd =3D=3D GP2AP020A00F_CMD_READ_RAW_CLEAR || cmd =3D=3D GP2AP020A00F_CMD_READ_RAW_IR) gp2ap020a00f_output_to_lux(data, val); =20 -error_ret: return err; } =20 @@ -1415,18 +1412,19 @@ static const struct iio_buffer_setup_ops gp2ap020a0= 0f_buffer_setup_ops =3D { static int gp2ap020a00f_probe(struct i2c_client *client) { const struct i2c_device_id *id =3D i2c_client_get_device_id(client); + struct device *dev =3D &client->dev; struct gp2ap020a00f_data *data; struct iio_dev *indio_dev; struct regmap *regmap; int err; =20 - indio_dev =3D devm_iio_device_alloc(&client->dev, sizeof(*data)); + indio_dev =3D devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) return -ENOMEM; =20 data =3D iio_priv(indio_dev); =20 - data->vled_reg =3D devm_regulator_get(&client->dev, "vled"); + data->vled_reg =3D devm_regulator_get(dev, "vled"); if (IS_ERR(data->vled_reg)) return PTR_ERR(data->vled_reg); =20 @@ -1436,7 +1434,7 @@ static int gp2ap020a00f_probe(struct i2c_client *clie= nt) =20 regmap =3D devm_regmap_init_i2c(client, &gp2ap020a00f_regmap_config); if (IS_ERR(regmap)) { - dev_err(&client->dev, "Regmap initialization failed.\n"); + dev_err(dev, "Regmap initialization failed.\n"); err =3D PTR_ERR(regmap); goto error_regulator_disable; } @@ -1447,7 +1445,7 @@ static int gp2ap020a00f_probe(struct i2c_client *clie= nt) ARRAY_SIZE(gp2ap020a00f_reg_init_tab)); =20 if (err < 0) { - dev_err(&client->dev, "Device initialization failed.\n"); + dev_err(dev, "Device initialization failed.\n"); goto error_regulator_disable; } =20 @@ -1472,11 +1470,10 @@ static int gp2ap020a00f_probe(struct i2c_client *cl= ient) goto error_regulator_disable; =20 /* Allocate trigger */ - data->trig =3D devm_iio_trigger_alloc(&client->dev, "%s-trigger", - indio_dev->name); + data->trig =3D devm_iio_trigger_alloc(dev, "%s-trigger", indio_dev->name); if (data->trig =3D=3D NULL) { err =3D -ENOMEM; - dev_err(&indio_dev->dev, "Failed to allocate iio trigger.\n"); + dev_err(dev, "Failed to allocate iio trigger.\n"); goto error_uninit_buffer; } =20 @@ -1488,7 +1485,7 @@ static int gp2ap020a00f_probe(struct i2c_client *clie= nt) "gp2ap020a00f_als_event", indio_dev); if (err < 0) { - dev_err(&client->dev, "Irq request failed.\n"); + dev_err(dev, "Irq request failed.\n"); goto error_uninit_buffer; } =20 @@ -1496,7 +1493,7 @@ static int gp2ap020a00f_probe(struct i2c_client *clie= nt) =20 err =3D iio_trigger_register(data->trig); if (err < 0) { - dev_err(&client->dev, "Failed to register iio trigger.\n"); + dev_err(dev, "Failed to register iio trigger.\n"); goto error_free_irq; } =20 @@ -1522,12 +1519,13 @@ static void gp2ap020a00f_remove(struct i2c_client *= client) { struct iio_dev *indio_dev =3D i2c_get_clientdata(client); struct gp2ap020a00f_data *data =3D iio_priv(indio_dev); + struct device *dev =3D &client->dev; int err; =20 err =3D gp2ap020a00f_set_operation_mode(data, GP2AP020A00F_OPMODE_SHUTDOWN); if (err < 0) - dev_err(&indio_dev->dev, "Failed to power off the device.\n"); + dev_err(dev, "Failed to power off the device.\n"); =20 iio_device_unregister(indio_dev); iio_trigger_unregister(data->trig); --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) (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 D38A1346777 for ; Mon, 23 Feb 2026 03:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818050; cv=none; b=m1bsltqnTDc9irK3H0Ftzoqwjuif+iFd+EyHcWbdlrXVF4E3vEd4fCCl3NXTNSyFTXmEfvTdSzYmpzX2ZN3dNdG1ugfLe3s1gHF2/ywFRIb+vdeFt7sDm12KU4dn77xjmzDZS42jr/70R1I91knyiutNBjYK7+NjxJWCF55cHt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818050; c=relaxed/simple; bh=ojkJ6HR611cjx7257sMX31BsGcwTLb0wr5jxnZQGNKA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UeCOLfdEugHxuiJJBCKuznkbrEujGjxHIvybXb5aarEG4JHcViwHTUrnjuFlkRh+dQHnQbLYORk4Ou34HV793C426g0MZGk6I+Apj7iV0rQxI2cTFeVGBbELVpxP7ceQXRrw4i283PqxVViae/fqYiuPTSgDE/82rRGf4OX164I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=W6YsYNX4; arc=none smtp.client-ip=209.85.128.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="W6YsYNX4" Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-797d36fdb96so60975427b3.1 for ; Sun, 22 Feb 2026 19:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818048; x=1772422848; 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=ZddAUHyZfeURC2k1s53wLgt+CwTc0WLUD/YiA8Cx2cY=; b=W6YsYNX4yDQJIG8vKTciqbE0BJ14g7y7hwFES4PDXeblYzE9zZnmGARtrVQWVYCx/V ig+AIhLVFkJhhjv+8toIgEElsvmT0bC0AymWEzu/QE/+dlMtebDLGV5q+z7vOOBPzBJK XI/cQBbKRAjSVlqyKtXqL6PW/VV12df9LmwE3wPqO+ghNcYV/cZ026dKWLZsfDR6zs6Z 4S8XXiFoWbxmVIvKN6I3sLr8DolF13fVdb4B7mXacWnoHYQCFp7BOma+vSB/g0lBgna4 X5z7dwvVGI56JuM0ghgfR/0aYOfkfh7j0w3Bhk5SQDJG6NMHTruoj9iaIHitwVtGa2Vh Y7pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818048; x=1772422848; 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=ZddAUHyZfeURC2k1s53wLgt+CwTc0WLUD/YiA8Cx2cY=; b=eCpBVlTPwWbBjTZ53B2iB27oB/xVS+APpe5TcjUBJA2Nctv5DQa6CYCpn9JDS0bZE4 4FHXLBJTfB5Hd8O8X0sZ863+cCAOOJrZXYcQaNh/ss3OyAag0EQJS/KHrVzTbEIhEP2i OZe7GUwuLcrXDs0XIbBMM2xC5cnE+8K/sw3ezk1YaHdov1Yp0VwmA5L6AU7VRobnM1n2 f1N75eDbemGrvRc8hjZua0z4EfdXDgTcam/+fu18njLqW7O83JCunA0GPzo3hPu7IMkw RotmPJBK/FUVJUD9OJ5W0RP7TwvmyGIefT4KqLB+txPylGTalRsxnle9XBrj3kkPI8+W kKCg== X-Forwarded-Encrypted: i=1; AJvYcCWzNu8+/NK1+f7hKTFlukWbO7lzKDU48oHmk89FtlQxkCtMz11hFAtTumygEKOnpEKF17ddU+NxwHTgzg0=@vger.kernel.org X-Gm-Message-State: AOJu0YwdZdR4ACnZOTmiZvutfNTYFE9oRoEABQTLqfLK+6RXD79hf9kA zhMW5n0K8J+04KzZczExu9rSedCkZ/vPmYm/YcAEg8UzajgW9nS3w+4I X-Gm-Gg: ATEYQzwYKUE+IkEUdYRs4tHD4vnJUpmYkGyLLP1vJ7sOmbsm6EIyy9h69zzheFOogGE 9AYCWhJ9v8ouhmAhNJnD+fHdN3AY/COu0RX8gQwwEaN+xPo4svG6J9Cz3gkvu+WkoUIZ5Df1oC4 6JiCRWvaOVnkvoYIp9EYbclnV9LLbMG3idx1sKqVnp8CC51Wq2NbTRRJEY379wc40b6t+QhJIpj ZvW7pTj+S3LvMLDxXgMmJbmPPZKSoVD+5AWI9PAY6pHSBgckfRL5TVTluzQi36bFyL+brcqhlCi huFiPUcqiLo1zggXfO9u4Q/iQhlwSTBATGjJ+fGmb+F38anEAzoLgXpNKN7iSP+3FlH+d7gt+cI VtjixyOHlwhukMZYLXV58FBtFScKyb13K+PUIloxrJQfV1/Xx+9mIHCafwnL/8FrxPPpUoA61MA ponHtoSs4EmaYX/yM9KjZ/2bm+AWTjTpJUbkaFw/uR8FVhazmc+8h4ACYqR7QTNowPn8TWuezhS CweszZqdFQWM+eoacfCO9az X-Received: by 2002:a05:690c:620a:b0:797:e635:697a with SMTP id 00721157ae682-7982b69aac8mr56754847b3.1.1771818048111; Sun, 22 Feb 2026 19:40:48 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:47 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 08/10] iio: light: gp2ap020a00f: Explicitly use string literal for driver name Date: Sun, 22 Feb 2026 21:40:18 -0600 Message-ID: <20260223034020.27625-9-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko The driver name should be easily greppable and clearly spelled. Replace a level of indirection and explicitly use string literal. While at it, remove useless blank lines before module_*() and MODULE_*() macros. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 97630ce9ade0..0d7262e1c5c9 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -55,8 +55,6 @@ #include #include =20 -#define GP2A_I2C_NAME "gp2ap020a00f" - /* Registers */ #define GP2AP020A00F_OP_REG 0x00 /* Basic operations */ #define GP2AP020A00F_ALS_REG 0x01 /* ALS related settings */ @@ -1535,10 +1533,9 @@ static void gp2ap020a00f_remove(struct i2c_client *c= lient) } =20 static const struct i2c_device_id gp2ap020a00f_id[] =3D { - { GP2A_I2C_NAME }, + { "gp2ap020a00f" }, { } }; - MODULE_DEVICE_TABLE(i2c, gp2ap020a00f_id); =20 static const struct of_device_id gp2ap020a00f_of_match[] =3D { @@ -1549,14 +1546,13 @@ MODULE_DEVICE_TABLE(of, gp2ap020a00f_of_match); =20 static struct i2c_driver gp2ap020a00f_driver =3D { .driver =3D { - .name =3D GP2A_I2C_NAME, + .name =3D "gp2ap020a00f", .of_match_table =3D gp2ap020a00f_of_match, }, .probe =3D gp2ap020a00f_probe, .remove =3D gp2ap020a00f_remove, .id_table =3D gp2ap020a00f_id, }; - module_i2c_driver(gp2ap020a00f_driver); =20 MODULE_AUTHOR("Jacek Anaszewski "); --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) (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 D4E9D346A15 for ; Mon, 23 Feb 2026 03:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818051; cv=none; b=M+bSSWE26qVxFxbWoEZ7TH8poEC5o5zdeDuuqOi7ph7/dJSEJ/ClJUnBvcW1sS46FHKyLmCEb7NeCpMpoiqJRK0MsVlCgbs/Ku+D1EVfKse3lgD1qk8q/KHKbIXvS33hD7IWozh88zER2JpAegNFWob5KgjPwYG5PjRXobOl97M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818051; c=relaxed/simple; bh=hhtFSBCaNAA1inHtvsUmd08xIDDQXrIaMtP+/Cvg1B8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mvHo4joDK/5a1ze7WxqkAOXy5a0Pc+/IEAtWHJrU+CCyvC03PhQvxsU9cXdDTcf6H7bVFnDSQtee+33gBjgb9PALO5rcSn7avn7Xo+IOAVAOfK/rrbCmkrXh+Nk0DxbEYaJVpbIAcFbhhDMqyvXSfg0di9pjzO5GklkSCHMMRIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OXyBlUG5; arc=none smtp.client-ip=209.85.128.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OXyBlUG5" Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-78fc4425b6bso33271227b3.1 for ; Sun, 22 Feb 2026 19:40:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818049; x=1772422849; 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=LTdCFkQOcqAQyxWkRPn6EMiNCtV+X3PZKtlzItBFjYI=; b=OXyBlUG5L2HGWUJaPZ1J+n4RQNURLjJiIQAvfaACJuWi+WhWcVVR8HHzXLMpmH9Lw7 iDCOPkKZQD/Gky7HCDBodZESJrRWbisvPxP3T9nF4yw0zOBT+do5Dn2opNbIRBPigAbD vg7GRIkhq6oH3U4bH6ZKcfYNx8wDyxFsopLszwH2ydYNCT1ECbgsdEWQnM+/lqfUZQaL TSGb3uTnu0Vr8JlJwAyfbVcr36NcbgB2nkxQ88INCdH2RPTQlK3KWcWIEEhNt16TU5ui Iy7Je7k1eOoMYLh+VyD27sjuHZSpgrnh0gI/UPC4+fz5R8geM+phMfNu3tyKnEkNNaQh mo6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818049; x=1772422849; 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=LTdCFkQOcqAQyxWkRPn6EMiNCtV+X3PZKtlzItBFjYI=; b=Mn/jgX+7ePqyCP9UNFs/M9f1JBNbSUMxh8MRzqqLiUIF+IXOu3Z6vzOqnpXPV5XTtM f8IFyT7NPtbbxhX66BoJT6tYvUbcxmcOW7yt6Z3TKjTN4bUo3B5kw8jw8hh0A14cwWOA 1VKvDpMQEY8bXGRUoRTDGvMAgZUjVTaqp5DnPDHDZQlQLi9TNKaldKSBbmt0rYQxnal+ lNtQoBNS1rymM47Or1QwuszuEPysPYR5szAzRu6bzc1nxo54lhJlFGfJ37NECTV1IO2F ppWhJMbK0kW/EhhrxtUQtVWqiGsZWELPp7VeeyYDIF4RDhdVybiZzb90oXW5nitv+0hq SLoQ== X-Forwarded-Encrypted: i=1; AJvYcCUDa/GtNKrrEo2KlpoM+yMVRRo7y44HAibGkpdnzPig2QI9wWFONqZspHCIxJJ+C+59s5NF+sUnrjLTN0c=@vger.kernel.org X-Gm-Message-State: AOJu0YwBtGxvTVH1tlveic/2NVxB+sVoi6tUL7gJ/KREqeu1l3oqJN3k AWbNt+Ik9/EDiuMhL8J3WVjuTD9ykbg3kq+fTWVfMsXKB6HgHeGWNhnA X-Gm-Gg: ATEYQzybh8p7ZcifgdN7GFNtiWlc8kQoTBDyBKv3Bxnoq5TqOL0Qu/YpZpvSGA0D8eK hC1aiKQVJy0tZ5mYchmyplejXiDYm3hRtIOb6X0jv6ahDsyi8rDOxwQOtqqqJrgZYG97i9yXJay bUmC+EsD3PLK7W+dQfjJeIW8Wlcv40UN6VSUNclBkBmOZ98CoVSvYhhnzhUC0jORG6z64O9Y2F0 6q2eD1Ac55p2Ztqqqcs9thY0HK/oKISWdOYbk1vztCiePBnwn585agnvTr2q3FPDCprN2LAqjLt Ifjw5wOilfjLNYLu5de9Ho8zaTVNNZgLIyrnlWD/O7Z1uk1sXnfJ3z1ugTNQLBb+4qSivD5pMSH cOXnubAM7sm+h0pJhlFT7gCmGorxxgug3C//g28a/Wwel9CUrl7UWTjmK+I0g4ctp9o9c2zRWsw 01FdAD9lLJMQ+XCiYF+SEi8YNR1c3y2QGXi4HMjxoGr1OzeUHcd+aCI+ZvyDN9g7F8o1E/Fsw66 Tx+okn5teKSlfu2YPhbeVkS X-Received: by 2002:a05:690c:389:b0:798:3a5:5a76 with SMTP id 00721157ae682-79828f1e46cmr58018697b3.17.1771818048999; Sun, 22 Feb 2026 19:40:48 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:48 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 09/10] iio: light: gp2ap020a00f: Remove trailing comma in termination entry Date: Sun, 22 Feb 2026 21:40:19 -0600 Message-ID: <20260223034020.27625-10-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko Termination entry by definition should be the last one, hence remove stray comma after it. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 0d7262e1c5c9..0571803155ae 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -195,7 +195,7 @@ enum gp2ap020a00f_opmode { GP2AP020A00F_OPMODE_ALS_AND_PS, GP2AP020A00F_OPMODE_PROX_DETECT, GP2AP020A00F_OPMODE_SHUTDOWN, - GP2AP020A00F_NUM_OPMODES, + GP2AP020A00F_NUM_OPMODES }; =20 enum gp2ap020a00f_cmd { --=20 2.53.0 From nobody Fri Apr 17 07:44:20 2026 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 C3D2434404B for ; Mon, 23 Feb 2026 03:40:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818052; cv=none; b=nnEyuIpdxtevfr4R9ttqtEnaYUHzuY5r1Mb3yQ4WSMmB4NkM+vClTXXuMUEUW5HTHIZPM57gA+LL/wQuACqXxn7a0svFD2JCuvw/UwjUPbAE1mo/JABoEAu+xUGiiSo/TTsQelkFaALRZkg/ERD8BVGID1LhJ7GJnMitYqkfEeE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771818052; c=relaxed/simple; bh=JpgjQT0LjeiOJzmjtLe3sLwto3eScrmQ5EGl4TkpJGM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NLbNGlbmkm8+G3UqnCQlf+OWGrbu7ldpcjscjo0+N/CiFl80bMk4snzxUA9QyR4vKCnqumhmmCQSLQPJUfRjEkiGcd4q3+52AK+f+UtB/b0gS7YCSaAGeq6TK1oNbRnPdBS6h3hk0KMbRTnuvXQrTsy4TLfqHMiv9UY/mrXgFxg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Y3eh76Xb; arc=none smtp.client-ip=209.85.128.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y3eh76Xb" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-79495b1aaa7so32051047b3.1 for ; Sun, 22 Feb 2026 19:40:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771818050; x=1772422850; 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=AODKCMIgB1Rg+62Tm7VBERUXirbCJ30DxdcOZIoJtvI=; b=Y3eh76XbvYOfTLxggvnVoAH91XmeHvlo/mNTu5t9PTI8zORZZfTBQD58mUiyysyYnz Hn7f+T21TUuu07y4mFHtUMv+8VdkbdOQdj9tjVBZS3urlPvizQUATMwAbHmFsBabWUYs s5y+HB68HO++PyYijjtZhGvq8SnUsnjmqVshWyN/Bpkt84SKBUFKdf/btHmztLXXX34s 4rw4ZMzpqFXRLdZQq5rvgVNgrxEOfKNO90vm6CArQSTS9nY+LXPYLuGeDrgapektDBan eZZUD8567kpm9AybxITnFHJb2F0fSvEWf/fTMM+5hKPL3AxKtN6RNOT0sG9PBbApGKz9 xYuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771818050; x=1772422850; 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=AODKCMIgB1Rg+62Tm7VBERUXirbCJ30DxdcOZIoJtvI=; b=RgkYSCITFHNnbDbOgx64HVPnGyWO/c7iIzeccw9h4f/JBBCLMMQ7bNo2UPpjQJje+3 UlMfjI4poZHBxU2MglLFLhlilHIVW9xEW1Vb0PWV4Sr7zYFCMd3WX4lPcrhE6mUS/OOC jYMNan1GtkupnJAUYyTZEWDT/Q9kNusfHvSqK1lSMy8aSLHNxvW9qz9hEAWPbXTLItM5 wGuv1hLHHKh4wFewlbmWsleUBtZmYoJuNnOkGFlVMZiR3K3McBTVZxzh8sLVlhr9sQ2I UNfS1JXn4dZdEZU81V5FWW5mmXW7bD70kTyN/0wy/gjJ99TqV96MU7a2jEnAUJaFVp5v tOyw== X-Forwarded-Encrypted: i=1; AJvYcCUBX8mY6llod3aQ7ei5Bz84f0Tw5Y+mLhxCbrzluSY3RynO3o3LdoXseD81bZ2mZiR/xfhxFBFrxnmFg+s=@vger.kernel.org X-Gm-Message-State: AOJu0Yx5xVHTexPwinm+W+LS/B58ZmlvMUaRzvWadFFKzloSzwBMnYKC F3nClGDUN68G9TUxccvuItKqJIwx9LDzJFQrDuBlEpF74KrUyTg5swh8 X-Gm-Gg: ATEYQzykwW5DsKjSTnnTB8vCIuCmuJ7qBzrYeIUTUUFaTSRXk7KWl23SkqdV4NWESpA k5WlF3g4+sBPRCfp1u+6XezWdcqDZXBA/p9/zXvEWj0DpiSmhHO1DR7Tm2A8N3CnnlhrjiVcAl9 UpGKZukAQZO7iq3GIp8JXIx+4B5eEfklM+4sMv7SzEy81cj6+qL7KAeaNwOJ37BGE+39imXGerq j4yiVgFn18tSGI3QK1KwRA82NlAzGc9SV3fvrR/OAUmsbmtdH8+nWjoTMVbnnil0BhE1dxJs6Lv SaTj8Rb8kZZ5LWzlnjFXPm3zh0ZvCf0WkE6o+lTU2i9g/dcGUN3YSqRlcvbf0bK6YsG237lD/fG cu770S49XaPUNAQ5xaXx2DgTsro4AZh5F8o7hPjl5OnsjihKdCZoxXPUfYs1Amj4tt00VtAE+Cv kk7UBhveqzE1d/bZh7dn5CQ5Pgsvh5BEt5AR0tAW5DZREETgxIUtXqWWHamBfLQCoJcuUmtTvm1 6M17n1yv5rk4JsW8WVasPS/MRO4UmbbnSE= X-Received: by 2002:a05:690c:6ac6:b0:794:b8c0:5a98 with SMTP id 00721157ae682-798291a1469mr64770897b3.58.1771818049721; Sun, 22 Feb 2026 19:40:49 -0800 (PST) Received: from tux ([2601:7c0:c37c:4c00::5c0b]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7982dbd5939sm27285237b3.15.2026.02.22.19.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Feb 2026 19:40:49 -0800 (PST) From: Ethan Tidmore To: Jonathan Cameron , Andy Shevchenko Cc: David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , Ethan Tidmore Subject: [PATCH v5 10/10] iio: light: gp2ap020a00f: Join some lines of code to be a single line Date: Sun, 22 Feb 2026 21:40:20 -0600 Message-ID: <20260223034020.27625-11-ethantidmore06@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260223034020.27625-1-ethantidmore06@gmail.com> References: <20260223034020.27625-1-ethantidmore06@gmail.com> 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" From: Andy Shevchenko In some cases the wrapped lines are harder to follow. Join them despite being longer than 80 characters in some cases. Signed-off-by: Andy Shevchenko Signed-off-by: Ethan Tidmore --- v5: - No change. v4: - Integrate Andy Shevchenko's cleanups. drivers/iio/light/gp2ap020a00f.c | 39 +++++++++++--------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/drivers/iio/light/gp2ap020a00f.c b/drivers/iio/light/gp2ap020a= 00f.c index 0571803155ae..9d4a310f92b7 100644 --- a/drivers/iio/light/gp2ap020a00f.c +++ b/drivers/iio/light/gp2ap020a00f.c @@ -175,10 +175,8 @@ #define GP2AP020A00F_CHAN_TIMESTAMP 3 =20 #define GP2AP020A00F_DATA_READY_TIMEOUT msecs_to_jiffies(1000) -#define GP2AP020A00F_DATA_REG(chan) (GP2AP020A00F_D0_L_REG + \ - (chan) * 2) -#define GP2AP020A00F_THRESH_REG(th_val_id) (GP2AP020A00F_TL_L_REG + \ - (th_val_id) * 2) +#define GP2AP020A00F_DATA_REG(chan) (GP2AP020A00F_D0_L_REG + (chan) * 2) +#define GP2AP020A00F_THRESH_REG(th_val_id) (GP2AP020A00F_TL_L_REG + (th_va= l_id) * 2) #define GP2AP020A00F_THRESH_VAL_ID(reg_addr) ((reg_addr - 4) / 2) =20 #define GP2AP020A00F_SUBTRACT_MODE 0 @@ -390,20 +388,17 @@ static int gp2ap020a00f_set_operation_mode(struct gp2= ap020a00f_data *data, } =20 err =3D regmap_update_bits(data->regmap, GP2AP020A00F_ALS_REG, - GP2AP020A00F_PRST_MASK, opmode_regs_settings[op] - .als_reg); + GP2AP020A00F_PRST_MASK, opmode_regs_settings[op].als_reg); if (err < 0) return err; =20 err =3D regmap_update_bits(data->regmap, GP2AP020A00F_PS_REG, - GP2AP020A00F_INTTYPE_MASK, opmode_regs_settings[op] - .ps_reg); + GP2AP020A00F_INTTYPE_MASK, opmode_regs_settings[op].ps_reg); if (err < 0) return err; =20 err =3D regmap_update_bits(data->regmap, GP2AP020A00F_LED_REG, - GP2AP020A00F_PIN_MASK, opmode_regs_settings[op] - .led_reg); + GP2AP020A00F_PIN_MASK, opmode_regs_settings[op].led_reg); if (err < 0) return err; } @@ -861,8 +856,7 @@ static irqreturn_t gp2ap020a00f_thresh_event_handler(in= t irq, void *data) int thresh_val_id, ret; =20 /* Read interrupt flags */ - ret =3D regmap_read(priv->regmap, GP2AP020A00F_OP_REG, - &op_reg_val); + ret =3D regmap_read(priv->regmap, GP2AP020A00F_OP_REG, &op_reg_val); if (ret < 0) goto done; =20 @@ -874,8 +868,7 @@ static irqreturn_t gp2ap020a00f_thresh_event_handler(in= t irq, void *data) =20 /* Clear interrupt flags (if not in INTTYPE_PULSE mode) */ if (priv->cur_opmode !=3D GP2AP020A00F_OPMODE_PROX_DETECT) { - ret =3D regmap_write(priv->regmap, GP2AP020A00F_OP_REG, - op_reg_val); + ret =3D regmap_write(priv->regmap, GP2AP020A00F_OP_REG, op_reg_val); if (ret < 0) goto done; } @@ -972,8 +965,7 @@ static irqreturn_t gp2ap020a00f_trigger_handler(int irq= , void *data) } } =20 - iio_push_to_buffers_with_timestamp(indio_dev, priv->buffer, - pf->timestamp); + iio_push_to_buffers_with_timestamp(indio_dev, priv->buffer, pf->timestamp= ); done: iio_trigger_notify_done(indio_dev->trig); =20 @@ -1023,26 +1015,22 @@ static int gp2ap020a00f_write_event_val(struct iio_= dev *indio_dev, =20 switch (thresh_reg_l) { case GP2AP020A00F_TH_L_REG: - event_en =3D test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, - &data->flags); + event_en =3D test_bit(GP2AP020A00F_FLAG_ALS_RISING_EV, &data->flags); break; case GP2AP020A00F_TL_L_REG: - event_en =3D test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, - &data->flags); + event_en =3D test_bit(GP2AP020A00F_FLAG_ALS_FALLING_EV, &data->flags); break; case GP2AP020A00F_PH_L_REG: if (val =3D=3D 0) return -EINVAL; =20 - event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, - &data->flags); + event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_RISING_EV, &data->flags); break; case GP2AP020A00F_PL_L_REG: if (val =3D=3D 0) return -EINVAL; =20 - event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, - &data->flags); + event_en =3D test_bit(GP2AP020A00F_FLAG_PROX_FALLING_EV, &data->flags); break; } =20 @@ -1520,8 +1508,7 @@ static void gp2ap020a00f_remove(struct i2c_client *cl= ient) struct device *dev =3D &client->dev; int err; =20 - err =3D gp2ap020a00f_set_operation_mode(data, - GP2AP020A00F_OPMODE_SHUTDOWN); + err =3D gp2ap020a00f_set_operation_mode(data, GP2AP020A00F_OPMODE_SHUTDOW= N); if (err < 0) dev_err(dev, "Failed to power off the device.\n"); =20 --=20 2.53.0