From patchwork Thu Dec 5 16:51:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Li X-Patchwork-Id: 13895823 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 050B9E77170 for ; Thu, 5 Dec 2024 17:06:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Cc:To: In-Reply-To:References:Message-Id:Content-Transfer-Encoding:Content-Type: Subject:Date:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yLDBtNfni/M0yr6E6A9udqNvO4y+WKxsbN6N+QmozXQ=; b=N5t23rNNZV9l89L6tfMJzQmT/6 JHr5Qqh7wtK4+sVwxEKzzLjrCzp3BfPFxYi4KSodmDk1ghcrJCoXHHY4Kw4ElvJf3QfmuZhpynwKK Mky2MeGA5uWCNSWjCq2ZBJ+Bgr8qsUvfo1QIc2M961lHuRN62EDt6UNii6nQjgQNLHsgak974evII YcSnlylrNiJq6jyPTBtP9QlLbkr9ihHcjVLZYYXknaMX+Aj1y2bxjirLoaocR0kq5+P0CNECd9ViX DLpuEJJTo2JSTUoO0aiOZFVw+s2lLihUg78Su/RDnETyk3bIvCoCNna1zp/BbXHfV6s6GslSf0Mon pe9+AV8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tJFIo-0000000GsIh-0PnZ; Thu, 05 Dec 2024 17:06:10 +0000 Received: from mail-db8eur05on2061f.outbound.protection.outlook.com ([2a01:111:f403:2614::61f] helo=EUR05-DB8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tJF4j-0000000GpNC-0SkI for linux-arm-kernel@lists.infradead.org; Thu, 05 Dec 2024 16:51:38 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=euZUYETpnlbVgx1Y/ZiNbk5O6UqVw0ChMtXX4xBNusWgLPxsd+iYAH3sa6+vHnhvMAD0wVlUv70FbNCjuHc+oX1ZUHp1yxxucFAdddgTKSPlZvULWAB5JSMWfmOazv1yTDxRPH908qVN/YTFvSAIfd+SXQSQTxzZZele+x2UHV4DjwsIJ4GMaMXOKmCeQBHVxNXtUHepjKFaZywXa6z5BDHbx5Hr+wy0OLogu2Noz6UwVYGAGq7Z8B37JdCjBwCLK/FSzKc/eWpQtKPH7pb55ambjcHZ0XRuaaJdCmz/ejODzK8cA3NFrXHGRxfIEuDkm9IfJCPRW5rThwDuilmUbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=yLDBtNfni/M0yr6E6A9udqNvO4y+WKxsbN6N+QmozXQ=; b=Rq5+DQ+Bs3e8/yEGLDMFgOE8fkCu+bnXwy0UEemwLNoDgYBkRpScjL5DL8eFIEG5QfsdIMfLiX97Ytlws/yUXv/o0ju7h0ITc4TA0joq+JhNjsvn3p2PlSjlNGoyYsXSyXgTqqZ6wcqzZu+Kl1aUrW/+BOymyCGkMQ/z1CvrwbcL4sx9grnt9f5KOL7uUquCAgAc9YYl+EYdB5Ej5vurMEl8uWF+NSpbj2blxdd3sQApI7CnHNeCKhJq8g6wINlVjZo1dMPeSNTIaeAGg/31RYr5xdCRUQIlFGKcvhO+jhPhuT9DnOGlz5Hl7ogiN3sZpbkPkp+Ob8blQ1s43uXkGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yLDBtNfni/M0yr6E6A9udqNvO4y+WKxsbN6N+QmozXQ=; b=c33WNS/KfisrULUGfVAvZeFW0GbE6Uhql+OUdrhu5OzKPJkwYsqC9RI9nVb3imWD58idRpjtCwHMJ1uJMuTXuXYOHvf78f1A1W2HWESWL48tnuhuRXpes28SZ4RjN1ClPXBOSxLkY/JDRFrvBSsFthTpDyO6CF+LZWFE8Dveh92TpFdbsT5IV4+TpxncqlfApCDxJUA44RwypLgjSnrT3alLEuu7br5K1NXBZl8CpoUxatxh7THFKQTLlVda/42lIr7eCgRYH1Pbl3i7ioY7uP4/v5P471VaLC5Av9+eEvFGcIrM/kjVF6G7d50RV8twA2Uka8fqi2+VdtDkOaXKrA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DB9PR04MB9626.eurprd04.prod.outlook.com (2603:10a6:10:309::18) by AS8PR04MB7511.eurprd04.prod.outlook.com (2603:10a6:20b:23f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.13; Thu, 5 Dec 2024 16:51:34 +0000 Received: from DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::e81:b393:ebc5:bc3d]) by DB9PR04MB9626.eurprd04.prod.outlook.com ([fe80::e81:b393:ebc5:bc3d%4]) with mapi id 15.20.8230.010; Thu, 5 Dec 2024 16:51:34 +0000 From: Frank Li Date: Thu, 05 Dec 2024 11:51:10 -0500 Subject: [PATCH 2/5] regulator: pca9450: Use dev_err_probe() to simplify code Message-Id: <20241205-pca9450-v1-2-aab448b74e78@nxp.com> References: <20241205-pca9450-v1-0-aab448b74e78@nxp.com> In-Reply-To: <20241205-pca9450-v1-0-aab448b74e78@nxp.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Robin Gong , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, imx@lists.linux.dev, joy.zou@nxp.com, linux-arm-kernel@lists.infradead.org, Frank Li X-Mailer: b4 0.13-dev-e586c X-Developer-Signature: v=1; a=ed25519-sha256; t=1733417480; l=5056; i=Frank.Li@nxp.com; s=20240130; h=from:subject:message-id; bh=a+/tdvfNrna1Hxq1r+zVZqlrUGxbeu/wyD9Dmoa9nNQ=; b=SYZYkK/PEqkwMefZC7ZooIhhLiJ/UCY8lzC4yOl4E83iuDh923XrnTWkcwNCeTGLkAShsBAta IGSacrTzwH5D5LKTDq2HfaIRE/0vAfbCkanfgs+DT4z7IisWh0BTZQt X-Developer-Key: i=Frank.Li@nxp.com; a=ed25519; pk=I0L1sDUfPxpAkRvPKy7MdauTuSENRq+DnA+G4qcS94Q= X-ClientProxiedBy: BYAPR02CA0029.namprd02.prod.outlook.com (2603:10b6:a02:ee::42) To PAXPR04MB9642.eurprd04.prod.outlook.com (2603:10a6:102:240::14) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9PR04MB9626:EE_|AS8PR04MB7511:EE_ X-MS-Office365-Filtering-Correlation-Id: e59cf302-1fd8-4f24-6375-08dd154d1344 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|7416014|52116014|38350700014|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?q?v4p8FK39Z20nAV3uD1Qtw29BkG2S2Qe?= =?utf-8?q?3CnVbBodTE0GUQPg1U+9c/19RC5mOMOC2TCWBIuIgMmPadltOpsyiHjj6FAEd0LvQ?= =?utf-8?q?PJ8Filom4gVREmBgLYkxP8j9rOkLnibm6ZV3UavHnCv2R7gINLUXa5ky3afPKHgDW?= =?utf-8?q?sTcqMPmYdZRczlxVNLEE94w8Erk88Fs2ZMkNXW4yGjwaTHAXsP7GMHnxTpxTDqHLC?= =?utf-8?q?5mXkoJaM+pRfWyAfiSOPS+cR0gOvX6ffSoP3+xQ/o6Z20HMKlr//ub6FDcLH24T5O?= =?utf-8?q?U/kXmI5Fl9016dsVWpsRRU0c6Bm93SAV27wGFHjnm376QvTmeXNtwQJNO9it/vXnb?= =?utf-8?q?VKfi5nMQSzBPBVFzkRPRM2IT+odl6Dw30kLOLLlFwT5GLR9UJgUxt+tLTHD93Lcta?= =?utf-8?q?bKzoFva2wz/+vQ/mmS9ogrn7tFty0ivGlEs2Po8bVk+hTNATIGrrHcXzb6DmSDKOH?= =?utf-8?q?DDJQGC0zbRpsYmpWY5wALGvGVPLHAzE6P4/3FHb2fnXbKx6rNfkrZAqPYW8w7ZbsH?= =?utf-8?q?APRkLLEEtaZpVo7kHgYP+C3Iljib6FU+Og0Dm8hgBv6VIFACTwC4grO+8vrd5laQL?= =?utf-8?q?7Yivnm9EIh2Si/NSUtwyFl+6BOegaWA+GXFMJkklG9Av+T0Te9OMpAfGdd5pwWM34?= =?utf-8?q?g36dDY1ZF9yO/V+ZbD70PmZA3V9yQSfyNq/gzYTi9HV2qbeOZm48AqoC+IO09Byre?= =?utf-8?q?4ZFV/JhTQzBBwAkb0ifJ6E+G+UVLJF9kPn0Auxi/UII2hhuB41kPeGOBiJRvttzgR?= =?utf-8?q?Fb8+zDbMBNRryAqclPltuHm/67NeCdxRu90DUPHME0dh5jVQaNQNBb0EPE7kL3VD0?= =?utf-8?q?rxtqMd4fqdXGpxFtjDasSel15HEjMpw3mOExej6sPnj6d9UmY3X4N6LrfP1HG0X1Q?= =?utf-8?q?fW4skLh+qPABr882xtiHn1QxSWxCRT17yxmbZKH3wujor7Hn9gQrVOSzAx+xY29b7?= =?utf-8?q?aK041wLD+wo6L9FL8lErcfmX7AzZfYgxHAkpifGMT4Iw88vJdl6jGbz9Vd/7FBjPT?= =?utf-8?q?+56Py8H4CKaNxUSTyiNgYCbR/ZOW6Rf3rPOBOCe05iTSa6oUS6pOWGqNLcqQQe9R8?= =?utf-8?q?AbGxFPI/v9LdKqPqa1AJyBVIxeRgiZ03MoW7aLgS2V0UeH5xwNqwjIaAM4xE5T80P?= =?utf-8?q?R/w8gOdVusuVBt2zng+aaWtv8bULV6en6p57WsqzzOPbn0mz/dUAbAO+D7qOBcwLm?= =?utf-8?q?k78OCrvdVlkYyaN++m7WVMBLHUs+DNRPR10uVKDAR4E0SQrtll50sHOqkXYlupP1Y?= =?utf-8?q?yWSMl/K7F9c2h8NW4hpcTwrW5UVCIlk0SPcH8Vh8pUOx4ux00lkq878scqmYQh9W4?= =?utf-8?q?4HRG8l9tkPbSgGCH8igKx2XeBK4gsn4RrPGw7i+Tq7jEDoz+AerXSo8=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB9PR04MB9626.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(7416014)(52116014)(38350700014)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Fx2kfAINsT7jdJ3fz9ovb6WP1VGA?= =?utf-8?q?h6sU9nsy3szm4b78BKtA3zFTORVm/0YZT7HcWnxybdUcqJyA2suoJRjCtpEaLxpxE?= =?utf-8?q?LYudjjifTIwa6Z1TLz1+s26lh4imB1RtM4cpp94TGnKDK+4+BZ/eoCWKukB0bPojt?= =?utf-8?q?3WuCVQc7QIapi3ykMNDcnUSJ+zCxkZLAX0cX2hoWX/9Z4zI75kUUGSSdqyF7Ft9ET?= =?utf-8?q?u9M0JW8Ms3Xlz20yJe0lfkU9OAEucg6hHAkOVdIuB+mCDXWnfwt2FkPHhSGtykLyM?= =?utf-8?q?jUMXvVbSCUYn0LO4sA1JCg8Z5kU9HREOm6u0g3ORLgVGZy0smcJsU6VEYnn+PtkW7?= =?utf-8?q?QKlegZSwGalweBLKk1JhAJa7CSkC9J2tU5Gg4jx1/vHuJ8ZrajzMlS2xz0qxbrR9E?= =?utf-8?q?Jdxp+tc8ySnUqRNln2BJ2QUeI0GDv+E2FtvgVKRyhIzjxOmUgHrrFnNTOxthLxei1?= =?utf-8?q?9da0X25Vt8+q6T7rltDfLFyWWsA/Il7PD5YdBqsj7KitCZ62f7xYxk+gisRo9c34J?= =?utf-8?q?0xeSg15Yyv9u4HzY6RwWbP9IxWtcF1WSMKAkuA/KTIgVskrV1nCcHM1do5J1SRM40?= =?utf-8?q?TptYOTg9/cwqmfotV/o8MO4eKgE0AR1lDmnGRg0cWcMQE/iY06BNsXwQ/R8cmgPHo?= =?utf-8?q?QPgd0GhXf55qRqx9DBQWapba4L/9L6pbCnYadutZJopfm+3ewZOrDo4ol3GpLnX6Y?= =?utf-8?q?Mxc6ZAZOLPCoRW01Q1zYBcss/p9TJLaF/DxZYwjvOWP+Ahj1tWpqEXXyb1ANr1DvZ?= =?utf-8?q?Nze4ipACtmcaBrQSXn8SBYt0NBFDLa5ZcPdupBdqonsyuvEqVWZZvU7hUeWKNLCJs?= =?utf-8?q?HhatsXmyLTWApfHUeUag+OpZEwDDJR2U2snMF0O/yGOzrr+ZatYUR8gi8W3C934/L?= =?utf-8?q?A7DxvpN5o54YYX0ema4k4KAMEtpNLKQLNHdqYV9XcymSLtGdsjTB4P2c9cPvibInx?= =?utf-8?q?RqGJ3uwI8sGCSzUMiH7wblWnThB4MEt4vZo8eYvpzlvjIJh/CERgfJLUE0xWlJgYc?= =?utf-8?q?VRO6KvD3EwdbBcaNVx04P+C+/uR1wy2ENF302l3JzZ2FGOd0Kn1wUuPtGrQyxP6bK?= =?utf-8?q?PFKb5pxXEgC5MyaK7BXhlolvypso+w2Q3otzeiqSZI2KG4FguTkU6n0FRrBZ/fb6R?= =?utf-8?q?WwnqQSXl95TgoHZksOjvQSTV8+Y300ZexA+6kAIYxPhSqlQ/yyUeP64IPkqFGjmjF?= =?utf-8?q?Jn/D9U2jM4f0kUGxRxdRClQinoaSDy5rNiJQkL8O75z4hb/y8kMlJqTc9tV81jBfW?= =?utf-8?q?8Qtv4yK/6xRf5rV6LMnI4UiPFs2nHaTGscxBjMpB+XFFOhwH9VW1hEnlzfhPcwcpL?= =?utf-8?q?vwaPmirejaHT0wY9OjvNekyMk0OexEln3ut3Ykji/cn02OyJOZhTROOa1eMhHU0nd?= =?utf-8?q?oQdbrvMI6mdvlTNIH3CL6nBVMjKTJLhq3l1bLkAqXEYxsCoAHR3qshE6p+Xshhacc?= =?utf-8?q?TvRHOmMMmChe2qMkwLpaMOy6bxNvVdyfr56hyFsHGYq7SX5SgxEFQ544KuSp+yfXt?= =?utf-8?q?ZVB7q8aTeQDZ?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e59cf302-1fd8-4f24-6375-08dd154d1344 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Dec 2024 16:51:33.9525 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Phmuumb5fWrRD0RqXTm4P2Jqp/Lt7lf33XkOhW7btMTgVcAll681YXW83Ox4BYD2Pc290A7hF3Bm9fE/4tQROg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7511 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241205_085137_303557_4BC48242 X-CRM114-Status: GOOD ( 14.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use dev_err_probe() to simplify code. Signed-off-by: Frank Li --- drivers/regulator/pca9450-regulator.c | 73 +++++++++++++---------------------- 1 file changed, 27 insertions(+), 46 deletions(-) diff --git a/drivers/regulator/pca9450-regulator.c b/drivers/regulator/pca9450-regulator.c index caeeed433165c..0b1f099fdd5ee 100644 --- a/drivers/regulator/pca9450-regulator.c +++ b/drivers/regulator/pca9450-regulator.c @@ -932,25 +932,20 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) pca9450->regmap = devm_regmap_init_i2c(i2c, &pca9450_regmap_config); - if (IS_ERR(pca9450->regmap)) { - dev_err(&i2c->dev, "regmap initialization failed\n"); - return PTR_ERR(pca9450->regmap); - } + if (IS_ERR(pca9450->regmap)) + return dev_err_probe(&i2c->dev, PTR_ERR(pca9450->regmap), + "regmap initialization failed\n"); ret = regmap_read(pca9450->regmap, PCA9450_REG_DEV_ID, &device_id); - if (ret) { - dev_err(&i2c->dev, "Read device id error\n"); - return ret; - } + if (ret) + return dev_err_probe(&i2c->dev, ret, "Read device id error\n"); /* Check your board and dts for match the right pmic */ if (((device_id >> 4) != 0x1 && type == PCA9450_TYPE_PCA9450A) || ((device_id >> 4) != 0x3 && type == PCA9450_TYPE_PCA9450BC) || - ((device_id >> 4) != 0x9 && type == PCA9450_TYPE_PCA9451A)) { - dev_err(&i2c->dev, "Device id(%x) mismatched\n", - device_id >> 4); - return -EINVAL; - } + ((device_id >> 4) != 0x9 && type == PCA9450_TYPE_PCA9451A)) + return dev_err_probe(&i2c->dev, -EINVAL, + "Device id(%x) mismatched\n", device_id >> 4); for (i = 0; i < pca9450->rcnt; i++) { const struct regulator_desc *desc; @@ -964,13 +959,9 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) config.dev = pca9450->dev; rdev = devm_regulator_register(pca9450->dev, desc, &config); - if (IS_ERR(rdev)) { - ret = PTR_ERR(rdev); - dev_err(pca9450->dev, - "Failed to register regulator(%s): %d\n", - desc->name, ret); - return ret; - } + if (IS_ERR(rdev)) + return dev_err_probe(pca9450->dev, PTR_ERR(rdev), + "Failed to register regulator(%s)\n", desc->name); } if (pca9450->irq) { @@ -978,29 +969,24 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) pca9450_irq_handler, (IRQF_TRIGGER_FALLING | IRQF_ONESHOT), "pca9450-irq", pca9450); - if (ret != 0) { - dev_err(pca9450->dev, "Failed to request IRQ: %d\n", - pca9450->irq); - return ret; - } + if (ret != 0) + return dev_err_probe(pca9450->dev, ret, "Failed to request IRQ: %d\n", + pca9450->irq); + /* Unmask all interrupt except PWRON/WDOG/RSVD */ ret = regmap_update_bits(pca9450->regmap, PCA9450_REG_INT1_MSK, IRQ_VR_FLT1 | IRQ_VR_FLT2 | IRQ_LOWVSYS | IRQ_THERM_105 | IRQ_THERM_125, IRQ_PWRON | IRQ_WDOGB | IRQ_RSVD); - if (ret) { - dev_err(&i2c->dev, "Unmask irq error\n"); - return ret; - } + if (ret) + return dev_err_probe(&i2c->dev, ret, "Unmask irq error\n"); } /* Clear PRESET_EN bit in BUCK123_DVS to use DVS registers */ ret = regmap_clear_bits(pca9450->regmap, PCA9450_REG_BUCK123_DVS, BUCK123_PRESET_EN); - if (ret) { - dev_err(&i2c->dev, "Failed to clear PRESET_EN bit: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(&i2c->dev, ret, "Failed to clear PRESET_EN bit\n"); if (of_property_read_bool(i2c->dev.of_node, "nxp,wdog_b-warm-reset")) reset_ctrl = WDOG_B_CFG_WARM; @@ -1010,20 +996,16 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) /* Set reset behavior on assertion of WDOG_B signal */ ret = regmap_update_bits(pca9450->regmap, PCA9450_REG_RESET_CTRL, WDOG_B_CFG_MASK, reset_ctrl); - if (ret) { - dev_err(&i2c->dev, "Failed to set WDOG_B reset behavior\n"); - return ret; - } + if (ret) + return dev_err_probe(&i2c->dev, ret, "Failed to set WDOG_B reset behavior\n"); if (of_property_read_bool(i2c->dev.of_node, "nxp,i2c-lt-enable")) { /* Enable I2C Level Translator */ ret = regmap_update_bits(pca9450->regmap, PCA9450_REG_CONFIG2, I2C_LT_MASK, I2C_LT_ON_STANDBY_RUN); - if (ret) { - dev_err(&i2c->dev, - "Failed to enable I2C level translator\n"); - return ret; - } + if (ret) + return dev_err_probe(&i2c->dev, ret, + "Failed to enable I2C level translator\n"); } /* @@ -1033,10 +1015,9 @@ static int pca9450_i2c_probe(struct i2c_client *i2c) */ pca9450->sd_vsel_gpio = gpiod_get_optional(pca9450->dev, "sd-vsel", GPIOD_OUT_HIGH); - if (IS_ERR(pca9450->sd_vsel_gpio)) { - dev_err(&i2c->dev, "Failed to get SD_VSEL GPIO\n"); - return PTR_ERR(pca9450->sd_vsel_gpio); - } + if (IS_ERR(pca9450->sd_vsel_gpio)) + return dev_err_probe(&i2c->dev, PTR_ERR(pca9450->sd_vsel_gpio), + "Failed to get SD_VSEL GPIO\n"); dev_info(&i2c->dev, "%s probed.\n", type == PCA9450_TYPE_PCA9450A ? "pca9450a" :