From nobody Thu May 1 19:28:10 2025
Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com
[209.85.218.45])
(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 81AAB2153F7
for <linux-kernel@vger.kernel.org>; Wed, 9 Apr 2025 20:37:40 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=209.85.218.45
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1744231064; cv=none;
b=fFu5iltEL7/cA+RL23x5nGAY62rMOJQCHh9LusfoMfYnbOq19TWY1WVmGmuWhVZWeiIL1o8WrHvO/2ZbA3wkSA98juMTKstSH4VBwUZLuSBZhKevPdii2I3aBJyfmFbMnmlE7P6aZDeEZs9bvLPceuNJDAkk+6Ui6muomYU4X/o=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1744231064; c=relaxed/simple;
bh=ko021o0chPJ/pDx9CtG/i6EPLlich4rSb+hQ8wotehM=;
h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
In-Reply-To:To:Cc;
b=h9t0W/T9ojK0KQMLaRpybTmr6l5T8zdmXGBX/LvHv0tgxQwiPgZIdX3bRP79TZRAx4XFzUOCezgANSIHMaCku3h7ikvz8gzI0czjrpw8OYxaqsz5jU4m+pvqDZQ/nhtVwRdWZuj+xrd51P5UtP9QvcdTBGmxVJLhfhTey53v5Qk=
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=A7twnjgU; arc=none smtp.client-ip=209.85.218.45
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="A7twnjgU"
Received: by mail-ej1-f45.google.com with SMTP id
a640c23a62f3a-ac3b12e8518so19571866b.0
for <linux-kernel@vger.kernel.org>;
Wed, 09 Apr 2025 13:37:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1744231056; x=1744835856;
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=JzewZfPwk4hJVFLYHiSrmH9jhhrX57HEhFAQDXSOGew=;
b=A7twnjgU0FQj1w/J+xk+0icOR48aVQtiHwss7vaJfG28nSpmGXYScy6L1vwVmewCED
vv2w2q0xE+Z7RTdKGgr89NNoIz8/1pX7NvJZ0zrHyjZmX0FfB1cR3KTEKGxOUfubZNGk
shhOqn8IQSNPHXxmNR+pO6x3i6U8woiQNzLdGF8yvj84QarUrbSE3SjBh09KTIbuibJX
T1fX7QECToQ7DTxkWnNqxCjPV5PEUmd1uUspLym2OyasjzEmL/VwkWwRzhh/vQnwyDqz
W3CMQ0UbC9+SggmQlFAOItX1+YjdcqCkYcklTAmr8/FETj2j8hVZnRxqsirSmI7v1xOd
l2sQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744231056; x=1744835856;
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=JzewZfPwk4hJVFLYHiSrmH9jhhrX57HEhFAQDXSOGew=;
b=jsU7KoRn5qsii+cu/n+l0O2qeZM2p+oC30xQ7oY5byWXzSrWgDJacMIqcvU9jvWIHe
ekPQTQYe5qiQWrhGLvckNdOmUQ4zVntC9HJV3MLUljicin5yzjlVU6n3UNKECUB7qS2G
CtUuDPa1wky6+T4AL6TUyJAXbmaOn9XXZ169n8GuIYbsPtW09YvqqYOIAS1TLbkGY4P7
X8sif0d5bpf3t8Lkt099eHudu+vYG/qYUD15dR8529HEqb/N4H4ybTL5lQyK4bA6EAk8
Z9w8AyahwdaoUDaOFCv3byy1qEYrgZUkvq0mSH8vC1hSWqexf0rJ0y5lAPatMBoLACBZ
ZgCg==
X-Forwarded-Encrypted: i=1;
AJvYcCUjbjQQ6Knqq2GwweAHBMHBncSMD4K9REUasKHH2Yy2AXC3huF59ZHO5VTyHhmF6piPBLvfgboi8CvSHUU=@vger.kernel.org
X-Gm-Message-State: AOJu0YzUdJydfW67VZSDd4l9rd4vvmh5NAiKFJm796E2iCHE/d3ysin4
F0dgcp1ekb581iEUpx3k4MluF78KrJO7WXhAE9IcqyPIozvGHqqDI42CttZDPoA=
X-Gm-Gg: ASbGncsikIalRp9Funx5SLQ9gwQIt0XJnFwsnmBbfhppdcLYoGXKSOQslWrnGn8hc5m
FuxmLsK7tPMikbzEfXQRl3ow7PqmzYy65FK7NhxJnZHHvMVy8BJ3LOGJKS+3RgOaB9rQHOezy3f
hOqNWKbvo0Jc3rE/Imp2+ns8aypjJAf0i9nfxQOPoOVDRqDTx7yMwEjVrxbo9zGyYA154nzv7Dg
2zN+CbUvNwD8+yO55oWl/0GDzmPEjqiJ7K5zikxv829LX7fIEj0e+2rgjHXtgXky06enOj0xD3B
i/8bR8pkOyWfGOimli0GqMbIEuH620iTAskG6m9Cask32kDHQq4oRW1gDQtmwueV2DXktFCGmQR
YRI4gYK5f93ka/AdWXwjrzV/0JeY=
X-Google-Smtp-Source:
AGHT+IGpsT9IiqTJupkCVJCKwUjfYOLBHOS0zZILWuXu5C8V5rItHRHHHMylNW+J8A+q4dyb1hPgug==
X-Received: by 2002:a17:907:7d9f:b0:aca:a16f:ee8f with SMTP id
a640c23a62f3a-acabd12b147mr8466766b.8.1744231056245;
Wed, 09 Apr 2025 13:37:36 -0700 (PDT)
Received: from puffmais.c.googlers.com
(40.162.204.35.bc.googleusercontent.com. [35.204.162.40])
by smtp.gmail.com with ESMTPSA id
a640c23a62f3a-acaa1ccc001sm145850366b.126.2025.04.09.13.37.35
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 09 Apr 2025 13:37:35 -0700 (PDT)
From: =?utf-8?q?Andr=C3=A9_Draszik?= <andre.draszik@linaro.org>
Date: Wed, 09 Apr 2025 21:37:34 +0100
Subject: [PATCH v4 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: <20250409-s2mpg10-v4-13-d66d5f39b6bf@linaro.org>
References: <20250409-s2mpg10-v4-0-d66d5f39b6bf@linaro.org>
In-Reply-To: <20250409-s2mpg10-v4-0-d66d5f39b6bf@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 b75d7fe86253037b4b7256a4d8c089003d58bc44..340f5f14eba3fad3b25935803dd=
33e91f7ec6629 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.604.gff1f9ca942-goog