From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 A2D313A6B8D for ; Sun, 14 Jun 2026 13:19:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781443151; cv=none; b=hi5yb5EEewJMRXlbQqBJuzn6Wd82GZv5pdYKp85Be7UGFWpGD6t0fa+K926TeVh8LTvvTarh+95CWkdKlor3a7tILsAzDozXcjV3Fp/KFXQnc532FQztWJMM5/f6QjEOvJne2nwbbE2nZ2CsJR5unFH4Q05XXOaQVQ77wwtFelw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781443151; c=relaxed/simple; bh=VpsekJgKgyNUwXeVM3uBLSOq/s4k35Xo3gx0kXHLQ/E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Pk/DL9e6r9Yid+KZhpqZm/SCxhdkcM9XoEohwNTtazMoqHt8t5zs70OVRjwY88SuzYI5nLxbEL3dV6g4GQU4C+vqMKriwMF4PhEUNd8LAV8iecS/DCT0S2QTM/63QxJQRh2ca/GPvLJrcV48ItYhxCrSSQqqUlZ/pkyKecBhfRU= 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=aBXy8kEa; arc=none smtp.client-ip=209.85.128.51 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="aBXy8kEa" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-490bc6a7958so27849895e9.1 for ; Sun, 14 Jun 2026 06:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781443148; x=1782047948; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Zf9bEWY7PTPQGv5EEwhDzgckj4bBWYf2ns3N6PMwkX4=; b=aBXy8kEajI1zj6BQ3BroaYu9YbYwSUw2kAd2Dl3XpvBaHEUTMuXiADcDWYfE6e9W4g JXV4fsMjn1wU5xNwOG+9zMD1E1UpNd6zATbNpdbAxclzzVuKmwk3G8XSC4te8ds3pelE /9VXcRAkvaJ7DZTetiWoLsPnRYZ7kgN/PtgikySUeE0DLH7RIC0C19/25MrJvSoZBg4I ZAJcMR5UlerUyW2QE/1/B/4eDVwEj/QfLHUgT082KSKS9GWmBtas8RnDB+YiiZPTXxxN jyiAHQr38uZSFHzLeD+nFEEngKIfNMd4gKtGiR15CkwmE6LHlwTNRajgXjJ7N8szBgN2 jkEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781443148; x=1782047948; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Zf9bEWY7PTPQGv5EEwhDzgckj4bBWYf2ns3N6PMwkX4=; b=HdE6zFXtTVxNoiKRxeRM7tlv2WP4yhFG11EDC205zfbyVqHZpS1mgZ1GW4TdVb0CaR vhAIkORj/Mgw3tRj2CRRjCNQjkRrvWFNBbxcubNHEZvk2+7x2AY0FDOHyj/FAg5HfDXk 2DheVrazU/QP3qLAbzbsqvPdB9FzEhF+mtw4LWkwb8q6wviyKqNJ/qVZ6HyhPkaFAdbg zfduVKAgRQUWria5r+PM2F0OXyasMIz+MvVrCdaTFkXmjy9ojLs3WwzUkSNDWCuR6f05 pKsjh/OyytSG8pYy4sCSGRcJwRHQ3+PoTEmDmA2jSfNDIoezT2sI+DBghwFmsPD0q0mT eAAg== X-Forwarded-Encrypted: i=1; AFNElJ9/f4imw4IIdQZc4F4l5FV11ue5Qdc6QMGa64OfOnHUwxvRo9cCm14BLck6V59twh1+SWAKUMn8K/1BUQY=@vger.kernel.org X-Gm-Message-State: AOJu0YyvJLRTDYwsvnHtyweB9iusi9XS4larvtuyomiho1UOGPSfhLb/ C3Wpw6boG1M46JtQex1jofySqlNCNLWfeg3gOwMI0iFEGuF42s/0ecYZ X-Gm-Gg: Acq92OFtmOyxQzGiJaitCywuUrFECJ6/Br+jHcTKQgFMIXib8X1lDK6vNCjfiMfS7RU PcGK7i5zrB97A9TGV9rS6MUeloQjixC/iP4Z/pBURFX359nMzxn1u3AOfb9vRrjNpNgRx5YWLLh nnFkcGEexStCNhanOfuSWQzso6qBBcoeDX9n2IGltNehcwftlDFC0wfu9r0LadcLjrSkLUnv4gq w+p7UCIBWawSA9L/fWtFj1rjMpF8cruwWP9cOzXQFdepQBbpuRFoUyasmB59PMcajeXwI5SG+NW VIkZ/6cE7iLvN6Fish4Tuileb/eCDwzO0EhPhGRgBM6YD6tND6Eblhzi35vwtXe5YIjt9gTEgpA RtJL9MHyksANqcDtItMY2auTBpHhm4CYTVBhONXNRVyxlxoGVN65sp2MGJ/ug26IRDpmFfaKNrR VaoHc5k3JgLSsD7SYmqdLLwf46nBh5R+8Vz5e2wTeaSpML4mJnJIw1Rd/Ob9K0hJYlSnKCG1OdK GMpbZe+Q6BPImI6VF7tX798vOHNuphHHjGTcYbS/ci2c/jxqiwLVm0XDwYJhdK66JCcwDPPXD9U 6NAGTb1X1tWJhwRZXMMZbIrCrxOKJR6CRKmwiFpJo2p08dsWBZU= X-Received: by 2002:a05:600c:c171:b0:48a:53cb:8604 with SMTP id 5b1f17b1804b1-490ec4dfb03mr99342215e9.14.1781443147986; Sun, 14 Jun 2026 06:19:07 -0700 (PDT) Received: from [192.168.1.187] ([2a02:8308:4092:11f0:c287:187e:fb7a:66a4]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4922037055csm168406355e9.13.2026.06.14.06.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 06:19:07 -0700 (PDT) From: Joshua Crofts Date: Sun, 14 Jun 2026 15:19:05 +0200 Subject: [PATCH v6 3/8] iio: light: opt3001: prefer dev_err_probe() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260614-opt3001-cleanup-v6-3-e3f5901dcc26@gmail.com> References: <20260614-opt3001-cleanup-v6-0-e3f5901dcc26@gmail.com> In-Reply-To: <20260614-opt3001-cleanup-v6-0-e3f5901dcc26@gmail.com> To: Jonathan Cameron , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Joshua Crofts , Maxwell Doose , Andy Shevchenko X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1781443145; l=3588; i=joshua.crofts1@gmail.com; s=20260530; h=from:subject:message-id; bh=VpsekJgKgyNUwXeVM3uBLSOq/s4k35Xo3gx0kXHLQ/E=; b=C/WWQZts2dxmh/A11s9TXIQV2nkOzJlZCFSatj/tkvn0o3xKZOE9A9d04beG14wN1ns2fWCHh GV9B+t/wYb4A04df9BU3JJ2Qwco8rpSWRXwgbsGtJdox9ziw4i1sZh2 X-Developer-Key: i=joshua.crofts1@gmail.com; a=ed25519; pk=RTDOoVwgeL4oFdASj9U+cxJuIjXuXk73zkjnGOJKbEo= Switch driver to use dev_err_probe() to unify error messages generated in *_probe() and probe path functions. Reviewed-by: Maxwell Doose Reviewed-by: Andy Shevchenko Signed-off-by: Joshua Crofts --- drivers/iio/light/opt3001.c | 57 ++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 34 deletions(-) diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c index 28455d887e1d..c1062ace184c 100644 --- a/drivers/iio/light/opt3001.c +++ b/drivers/iio/light/opt3001.c @@ -698,21 +698,17 @@ static int opt3001_read_id(struct opt3001 *opt) int ret; ret = i2c_smbus_read_word_swapped(client, OPT3001_MANUFACTURER_ID); - if (ret < 0) { - dev_err(dev, "failed to read register %02x\n", - OPT3001_MANUFACTURER_ID); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to read register %02x\n", + OPT3001_MANUFACTURER_ID); manufacturer[0] = ret >> 8; manufacturer[1] = ret & 0xff; ret = i2c_smbus_read_word_swapped(client, OPT3001_DEVICE_ID); - if (ret < 0) { - dev_err(dev, "failed to read register %02x\n", - OPT3001_DEVICE_ID); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to read register %02x\n", + OPT3001_DEVICE_ID); device_id = ret; @@ -730,11 +726,9 @@ static int opt3001_configure(struct opt3001 *opt) u16 reg; ret = i2c_smbus_read_word_swapped(client, OPT3001_CONFIGURATION); - if (ret < 0) { - dev_err(dev, "failed to read register %02x\n", - OPT3001_CONFIGURATION); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to read register %02x\n", + OPT3001_CONFIGURATION); reg = ret; @@ -758,28 +752,22 @@ static int opt3001_configure(struct opt3001 *opt) reg &= ~OPT3001_CONFIGURATION_FC_MASK; ret = i2c_smbus_write_word_swapped(client, OPT3001_CONFIGURATION, reg); - if (ret < 0) { - dev_err(dev, "failed to write register %02x\n", - OPT3001_CONFIGURATION); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to write register %02x\n", + OPT3001_CONFIGURATION); ret = i2c_smbus_read_word_swapped(client, OPT3001_LOW_LIMIT); - if (ret < 0) { - dev_err(dev, "failed to read register %02x\n", - OPT3001_LOW_LIMIT); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to read register %02x\n", + OPT3001_LOW_LIMIT); opt->low_thresh_mantissa = OPT3001_REG_MANTISSA(ret); opt->low_thresh_exp = OPT3001_REG_EXPONENT(ret); ret = i2c_smbus_read_word_swapped(client, OPT3001_HIGH_LIMIT); - if (ret < 0) { - dev_err(dev, "failed to read register %02x\n", - OPT3001_HIGH_LIMIT); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "failed to read register %02x\n", + OPT3001_HIGH_LIMIT); opt->high_thresh_mantissa = OPT3001_REG_MANTISSA(ret); opt->high_thresh_exp = OPT3001_REG_EXPONENT(ret); @@ -886,10 +874,11 @@ static int opt3001_probe(struct i2c_client *client) ret = request_threaded_irq(irq, NULL, opt3001_irq, IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "opt3001", iio); - if (ret) { - dev_err(dev, "failed to request IRQ #%d\n", irq); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, + "failed to request IRQ #%d\n", + irq); + opt->use_irq = true; } else { dev_dbg(dev, "enabling interrupt-less operation\n"); -- 2.54.0