From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 0F70B47D92D for ; Wed, 3 Jun 2026 17:12:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780506781; cv=none; b=eLNbtI8KXj72gIxWh1iu7nGWA2Oi0aJgsgfEX+2Rb7HAX1q3rZvkfoBzhdp2ZiXG4f2RXYMIsVru5M1GML2EN/oUu0aaU0CdThuDrMsfJ8UQ2IXSkHrsau5YuLftFVJ4+J762/mAwxkjeyGrxu+1zhz7nvPFumRRhOI+0nconUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780506781; c=relaxed/simple; bh=+qC0YWfflnYInnRf+X6ZznWVvUClte/iMms9DO3MvUo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=k6fAQURrbycGNz9iNr0WjQiMSeflMgvekZVDqg96hVkuvfo28UeKbZgp+TCuWQvGhbPoXhr2FCIcFN5KBLHnupclyzppUfSe63Gr8EXuTBdXiK1CnxNHrfrNmjU56ia0xrGtvf/Ln7TIUlvw36xu1yB08envb8U4KwVU57syfp0= 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=lbWO5vVY; arc=none smtp.client-ip=209.85.128.50 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="lbWO5vVY" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-490ac357c55so37470615e9.1 for ; Wed, 03 Jun 2026 10:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780506777; x=1781111577; 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=9Be/cBTIY2UtthPWGW4sFFao6/kg9emmQLSnpfKTVvo=; b=lbWO5vVYP2V4Ay2irakVMuijVxwj5iJ7M8Qt4XRJ0AKjUykOsgeL5ozwQCpdRPxDKR 2fr9kqiCL38rISCuSvXXegLkbEBSqH1UAzbUxUHNiXz0VVwfHGiHoq0RAuGf96VrfSsS Cd9URbrfUVYO6gDd1UwMWnxTpyGiTwfq8c2eCXlm94Th0v4DBBq44bgvSoSi5vA/Evcl 0yek/+odUmP10utg/RlKf5x/XUnMTrDXes9Ia0pDr4O7P9zd86ZAFiVKBh3rZ5XCEeSF 4yuDCZsCUuf3ozPh55kc4c6BZhz/YeLmZq6IAbL/kJO2gnyghic7E4npuBvGQRqlJ65g Guqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780506777; x=1781111577; 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=9Be/cBTIY2UtthPWGW4sFFao6/kg9emmQLSnpfKTVvo=; b=CQ1PYPdmNbZwTXwNTHAARq3S7J3fR6+lcgBoUbkRflbQdEiq/37LslkhwhWl5ANil6 1B6VA1rNk1NHKkhs3CiZaIkidWfaJTM9C7HiMY/a57+qleFe4rNFOSscfjhnYrLKfiwk vZoC/z0G4+YtdnK4pwcJC3GzHme0ZM6kQ8nIwgdwJ1aFo9+iIdC2b3R8uim8aiX15XZb 0gnTpxSg9yWJEOdY3VsjNsZmkPwgMFxG4fapWguPkqbFBQ0sbL2jbD8caViPv34PefP8 odSjRN4Kah5PuarskkdHjj9tQAl+By4WSagAHZ0ArIwdFWvmjb8qEXsCUmA0Br8vUizw qZDg== X-Forwarded-Encrypted: i=1; AFNElJ8Lleuc07zamaiZa77LNfEzadPwPU6To16ezS+XwvMA3mlLDKVkYxEeSNHLrnbhwsimn+UPamwqwRVgYHo=@vger.kernel.org X-Gm-Message-State: AOJu0YyQDeJ4RuN33sr1JTiEMFjY/2NP0QHMrDWp2a6F37ltfjc6nMix VMhXIMqt0IvdpHDyZcEivd6E7GppPbjjOSfSVlt1MvxUzgMwE5q2U3rwgF5Oj+cJ X-Gm-Gg: Acq92OF3Qf2W8YXuEe41EaJYihwxNuP3YO+u0H/gTmD+g8UBf5ckNXBI4QnDn84JA5r pVNLI6FXmqUgtQi2yQp2CHJuggHzvXYC11yNlkYU/AjR5wl4ZDQbMFe2DrCm+XgkcfBThfcM9fr 9qXF8dwkAqeDR591Xy2IfVAeEPFlqJFqkVO7r1yenQTUixcYBqhcXBTsYR3kMgqF9CFAvU531BW rtF4jjJuMhgIhIHqLPp1W7ysVF+X5mfd4IWKUH8HbXoz8NvKshFCubY+/geZTHme3A6TR9hxNfu vjNjzsFouysdm8u8Nq60KD4c8muf241K54BJfSPI9dM/5vc71e/rj1uFtPg54knrCHSl5AlHdLe //Wwh8wMUxlSgukHqCE4nwTQv+PxPoeNBFGQtPQm+mwpLh2DJ2ry4f8JbhyQXrS7OBum2m2WEzW 7Kx+KLt8joAw3PbUjuhoxIQ6budWzlV+2eUgYCfC66QIRonijfN77/yqOjhL0k6DyIVmLCbLD9x QV3ncQpeFTmq8L8FDj91DtjEVGVhgakJjVJC630GKJPO5kYpg0lM8zC5YZP0UWxxfnP1lJELQWr rBrTjuNh/bmJiLbEa7lTgOCs1pew3HUx9LB22Z7G/jpqhoCMjCo= X-Received: by 2002:a05:600c:4ec6:b0:490:b8e2:6380 with SMTP id 5b1f17b1804b1-490b8e264c9mr57333915e9.12.1780506777445; Wed, 03 Jun 2026 10:12:57 -0700 (PDT) Received: from [192.168.1.187] ([2a02:8308:4092:11f0:c287:187e:fb7a:66a4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4601f345209sm8797506f8f.17.2026.06.03.10.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jun 2026 10:12:57 -0700 (PDT) From: Joshua Crofts Date: Wed, 03 Jun 2026 19:12:56 +0200 Subject: [PATCH v5 5/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: <20260603-opt3001-cleanup-v5-5-3ef7b926d555@gmail.com> References: <20260603-opt3001-cleanup-v5-0-3ef7b926d555@gmail.com> In-Reply-To: <20260603-opt3001-cleanup-v5-0-3ef7b926d555@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 X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1780506773; l=3528; i=joshua.crofts1@gmail.com; s=20260530; h=from:subject:message-id; bh=+qC0YWfflnYInnRf+X6ZznWVvUClte/iMms9DO3MvUo=; b=OBv0spHsQfLwlI2kP+v23eUvLAlrzl19aHcpZ38EvdsT6kH7OSlrKhAMKSkQPSaULkwHrdBNz GJ+d6+XltfqCk318cpX6bLm06sV7yCIoCoNVGAV/g6ZFrCtJeY8dL96 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 Signed-off-by: Joshua Crofts --- drivers/iio/light/opt3001.c | 56 ++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 34 deletions(-) diff --git a/drivers/iio/light/opt3001.c b/drivers/iio/light/opt3001.c index 777a54753b0c..fa799edd6a9c 100644 --- a/drivers/iio/light/opt3001.c +++ b/drivers/iio/light/opt3001.c @@ -706,21 +706,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; @@ -738,11 +734,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; @@ -766,28 +760,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); @@ -894,10 +882,10 @@ 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