From nobody Tue May 6 00:09:00 2025
Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com
[209.85.208.48])
(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 C9CAD2475CB
for <linux-kernel@vger.kernel.org>; Thu, 3 Apr 2025 08:59:10 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.208.48
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743670755; cv=none;
b=StztQIzbZ6QlSMs/gNBHZZHLbcCw703/b5ewr+yD+kZAFRz3a0BPEejCnHdJgbV98BWITFHwp1a82iIkLenthelczUEA4FCeMBcvO2aZ/m8G4AIrAU1MnXnyM3gAY5h2QuB9eK+rWbe84aN8dAVJ2YUeDX6S76fkOeMv9wLSvA8=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743670755; c=relaxed/simple;
bh=NTgWVUrUYjaObzH0fsi/8He5KrYlIX0x8gD4jTNG9uA=;
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
In-Reply-To:To:Cc;
b=OpINbZ6wD8JVX84K/b4J1JShoVMLeV3xEGnG1sekBPeKtrZNt1PulKutpcD0PzIq2oHY/ERKkwtonx+GTnlVbBIQEzGO2bhrquGi1xNXLao9LEYtOH5Sb5EtVWKXfiQtrokKm4PpdghVvkWgKH334HHjbZm9WOfhYgW4tK8B2So=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org;
spf=pass smtp.mailfrom=linaro.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b=stMJ668h; arc=none smtp.client-ip=209.85.208.48
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=none dis=none) header.from=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=linaro.org
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org
header.b="stMJ668h"
Received: by mail-ed1-f48.google.com with SMTP id
4fb4d7f45d1cf-5e8be1bdb7bso1131651a12.0
for <linux-kernel@vger.kernel.org>;
Thu, 03 Apr 2025 01:59:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1743670748; x=1744275548;
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=+VoGJVSU0pPXxfOhXBJG1TDUozXlWar2eJ++GWdYkqc=;
b=stMJ668hBUruoNQosv6bNYKoCg/TQpJSc1KL1HVaA+7gGZzZy9V7BAqcAYRrX98pa1
DjoPAdzaPb38J3N5dmgBHrCVMyhobkFcd8pzHPsUPFr6rawzuZNXFthreBDabhFXaRtD
vbZLOx2JdHjRJC26mA7FV+TnOmlPxfrpBLyMPxv++KOTtlzI9TQfHwAFg4xQCD6CpVYk
WdvchYKeNGCj7zelqouw6yU+hBFRJUFs63JoXB+9UyGjQsJvQyt8zYKlgy9fGS831WUu
AtpXQOJJq8YhxdLVvWCxlffZJLVyB/kECYcaJerkSdsrxVuTdpcsU3/KN1pnC17Qbr7p
8lhw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743670748; x=1744275548;
h=cc:to:in-reply-to:references:message-id:content-transfer-encoding
:mime-version:subject:date:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=+VoGJVSU0pPXxfOhXBJG1TDUozXlWar2eJ++GWdYkqc=;
b=eoEcjjH28/gmqPiS/L6Qqq7NbELwqKKhhCAcsOZrTIKEXeC5nEnD1/J9r4MYuZTXg9
1MP96ohZ3PGjqjq81WYYSSJvmf54qOk2cKRQNuQdX4LeJciiKCWOvEeJmKk+yMiYQ2gK
OmBwcVsiM8bXlMUFsyUdhj3e6dKlV67gNL7dNSoJ0S+j357wYIqhckxC90TEzjSAiRXN
/hq9sD6Xw2V2PN5ESvhCL6WzZcXv0j65SK4Ia0uoslp4wbPx6a8y3Je6T1Tm2WyPVRqF
HzzvmQbyHjiba3M5F0BGh8TAYc9VtDjbgRJ+frMXGq09hY0dqGoz110YBebCgGwx3SyC
j11Q==
X-Forwarded-Encrypted: i=1;
AJvYcCWf82orXp0pKB0iah7Dfxg/NnKUX3XkP8+pzipFcOfHrRaiU/FjMDaMpw26Awk+PNXMwuEg6AvZNQWSFvM=@vger.kernel.org
X-Gm-Message-State: AOJu0Yyo+rY/ox5U4raTa1B/KgMDbYjo34jRcak0WJB2C0hE5kHdKhA2
gtO42YkgZsXzpf95pZkPM9A7qDiyuHgdL1C19Rexfyx0KQ6s1rT3kuJ66yUkyMA=
X-Gm-Gg: ASbGncu6yUx0xvNbX4LSPpNJl1QdwhmTV4UByCk5kuDEL2GJUwxWiDwdjVkutzFTez0
+/4H/Ht1E4ehf6WRBql1MbzJJyeVuuwnJLny5zD0XIXchiWOMIpd6BJrkadl/KrK1rOkt/vys57
bVvzXNginiy+wmsYv8kbti3qchSpVPwX/McoZkpIHtxrEtm8o4+bTTOkCLRy8wllRPWm5OC/YDm
g1mVcP+9o3AHaDwcpYd14oreER1lI/HrpKCepgrYdPgNCtxyfvwAn/Lcs18ZrmbpLcIsSTD7wX6
ebajavrnzab0TaEQF8iir5yxLGabd6h5eqTPE/wwZDdkYA6+TnDLDs7/SmwtjDdNVMMkdKJfrpi
m/WSANVa7zD+Ccg776FCBeIZCJ3mz
X-Google-Smtp-Source:
AGHT+IHqXiYq96qJtZ3yqV0dm+q8a7Y9OXDNzTpX/U8kjT+jFNIA0/WaLQE/aqJwj+78Op+QK5nrPQ==
X-Received: by 2002:a05:6402:3495:b0:5e4:9348:72c3 with SMTP id
4fb4d7f45d1cf-5f04eacb1a8mr4769024a12.10.1743670748486;
Thu, 03 Apr 2025 01:59:08 -0700 (PDT)
Received: from puffmais.c.googlers.com (8.239.204.35.bc.googleusercontent.com.
[35.204.239.8])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5f0880a535fsm637614a12.80.2025.04.03.01.59.08
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 03 Apr 2025 01:59:08 -0700 (PDT)
From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
Date: Thu, 03 Apr 2025 09:59:05 +0100
Subject: [PATCH v3 13/32] mfd: sec: use dev_err_probe() where appropriate
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-Id: <20250403-s2mpg10-v3-13-b542b3505e68@linaro.org>
References: <20250403-s2mpg10-v3-0-b542b3505e68@linaro.org>
In-Reply-To: <20250403-s2mpg10-v3-0-b542b3505e68@linaro.org>
To: Krzysztof Kozlowski <krzk@kernel.org>, Lee Jones <lee@kernel.org>,
Rob Herring <robh@kernel.org>, Conor Dooley <conor+dt@kernel.org>,
Sylwester Nawrocki <s.nawrocki@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>, Alim Akhtar <alim.akhtar@samsung.com>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>, Russell King <linux@armlinux.org.uk>,
Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Peter Griffin <peter.griffin@linaro.org>,
Tudor Ambarus <tudor.ambarus@linaro.org>,
Will McVicker <willmcvicker@google.com>, kernel-team@android.com,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
devicetree@vger.kernel.org, linux-clk@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-rtc@vger.kernel.org,
=?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
X-Mailer: b4 0.14.2
dev_err_probe() exists to simplify code and harmonise error messages,
there's no reason not to use it here.
While at it, harmonise some error messages.
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Andr=C3=A9 Draszik <andre.draszik@linaro.org>
---
drivers/mfd/sec-common.c | 6 +++---
drivers/mfd/sec-i2c.c | 10 +++-------
drivers/mfd/sec-irq.c | 14 +++++++-------
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/drivers/mfd/sec-common.c b/drivers/mfd/sec-common.c
index 1a6f14dda825adeaeee1a677459c7399c144d553..f4c606c5ee5a809a106b13e9474=
64f35a926b199 100644
--- a/drivers/mfd/sec-common.c
+++ b/drivers/mfd/sec-common.c
@@ -229,9 +229,9 @@ int sec_pmic_probe(struct device *dev, unsigned long de=
vice_type,
num_sec_devs =3D ARRAY_SIZE(s2mpu05_devs);
break;
default:
- dev_err(sec_pmic->dev, "Unsupported device type %lu\n",
- sec_pmic->device_type);
- return -EINVAL;
+ return dev_err_probe(sec_pmic->dev, -EINVAL,
+ "Unsupported device type %lu\n",
+ sec_pmic->device_type);
}
ret =3D devm_mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs,
NULL, 0, NULL);
diff --git a/drivers/mfd/sec-i2c.c b/drivers/mfd/sec-i2c.c
index 966d116dd781ac6ab63453f641b2a68bba3945a9..a107a9c1e760f90fcb59a9944b7=
4e9a39a0d946c 100644
--- a/drivers/mfd/sec-i2c.c
+++ b/drivers/mfd/sec-i2c.c
@@ -134,7 +134,6 @@ static int sec_pmic_i2c_probe(struct i2c_client *client)
const struct regmap_config *regmap;
unsigned long device_type;
struct regmap *regmap_pmic;
- int ret;
=20
device_type =3D (unsigned long)of_device_get_match_data(&client->dev);
=20
@@ -166,12 +165,9 @@ static int sec_pmic_i2c_probe(struct i2c_client *clien=
t)
}
=20
regmap_pmic =3D devm_regmap_init_i2c(client, regmap);
- if (IS_ERR(regmap_pmic)) {
- ret =3D PTR_ERR(regmap_pmic);
- dev_err(&client->dev, "Failed to allocate register map: %d\n",
- ret);
- return ret;
- }
+ if (IS_ERR(regmap_pmic))
+ return dev_err_probe(&client->dev, PTR_ERR(regmap_pmic),
+ "regmap init failed\n");
=20
return sec_pmic_probe(&client->dev, device_type, client->irq,
regmap_pmic, client);
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index aa467e488fb5ef79d5bc7110e1ba7c26fcfa9892..9f0173c48b0c8186a2cdc1d2179=
db081ef2e09c4 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -487,18 +487,18 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
sec_irq_chip =3D &s2mpu05_irq_chip;
break;
default:
- dev_err(sec_pmic->dev, "Unknown device type %lu\n",
- sec_pmic->device_type);
- return -EINVAL;
+ return dev_err_probe(sec_pmic->dev, -EINVAL,
+ "Unsupported device type %lu\n",
+ sec_pmic->device_type);
}
=20
ret =3D devm_regmap_add_irq_chip(sec_pmic->dev, sec_pmic->regmap_pmic,
sec_pmic->irq, IRQF_ONESHOT,
0, sec_irq_chip, &sec_pmic->irq_data);
- if (ret !=3D 0) {
- dev_err(sec_pmic->dev, "Failed to register IRQ chip: %d\n", ret);
- return ret;
- }
+ if (ret !=3D 0)
+ return dev_err_probe(sec_pmic->dev, ret,
+ "Failed to add %s IRQ chip\n",
+ sec_irq_chip->name);
=20
/*
* The rtc-s5m driver requests S2MPS14_IRQ_RTCA0 also for S2MPS11
--=20
2.49.0.472.ge94155a9ec-goog