From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lelvem-ot02.ext.ti.com (lelvem-ot02.ext.ti.com [198.47.23.235]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 881312980A8; Wed, 13 Aug 2025 22:58:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.235 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755125931; cv=none; b=TPHdEOtgfb3qDbJWbx5dDMrCJlW6mlURYBSk/PDQPHvfvRtB0fg27/nshubElKw0W1OIC47a4wOl1cVPMClTlfrHMmXf5fVMmYDL5jg5BkGPK2khtOa9hIAKSY2eT47KVVKs+DNu6Lsb5lUDMu7TtIXy7KTrQ+hgsXheXtolKho= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755125931; c=relaxed/simple; bh=7VPTVLLxq/DNYimYLPn12eRXgDEfiaC8/D5Y/XfUGtU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nZUm65cwStHo1B2AL0Ap7lkcJFignqcxxqyyRdGxD945fPnm7lxF9TzDVPLvrYD8iIE2l9DQ+oSfMOarJbx4zevFu8YS/wA9qKOPL0Q76KDZGottDddeF5akiDAJXJVFXCk/jgegxaE1GofASCKq7xFoTV/2buTYQp1Wa2tCf/8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=KBKzM3CA; arc=none smtp.client-ip=198.47.23.235 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="KBKzM3CA" Received: from lelvem-sh02.itg.ti.com ([10.180.78.226]) by lelvem-ot02.ext.ti.com (8.15.2/8.15.2) with ESMTP id 57DMwhIL2248377; Wed, 13 Aug 2025 17:58:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1755125923; bh=zW7wf8U7H0k219rYyFqzmSOqAbuZmutUlJ3BdxBMu3g=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=KBKzM3CA1dZPvJk8nqj+Biwwfs/EmDVJ5QBM04ClSG98b2Sd3Wc2SFb+/PLVj4vBg GYC1q/vV+bmnoFr+cSxEEgp6mRFKrNn1/TAkbx80KBEKhUePSLiriakoaxJcfbKveo jR4xceXyfAmJAEeBNYFcNHuqoZ4pLag9lSi+UlXE= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by lelvem-sh02.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 57DMwhl61288260 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Wed, 13 Aug 2025 17:58:43 -0500 Received: from DFLE114.ent.ti.com (10.64.6.35) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Wed, 13 Aug 2025 17:58:42 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Wed, 13 Aug 2025 17:58:42 -0500 Received: from lelvem-mr05.itg.ti.com ([10.249.42.149]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 57DMwfwe2683333; Wed, 13 Aug 2025 17:58:42 -0500 From: Andrew Davis To: Jonathan Cameron , David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko CC: , , Andrew Davis Subject: [PATCH 6/6] iio: health: afe4404: Use dev_err_probe() helper Date: Wed, 13 Aug 2025 17:58:40 -0500 Message-ID: <20250813225840.576305-6-afd@ti.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250813225840.576305-1-afd@ti.com> References: <20250813225840.576305-1-afd@ti.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea This checks for EPROBE_DEFER and allows us to print out the error code while return it directly saving some lines of code. Signed-off-by: Andrew Davis --- drivers/iio/health/afe4404.c | 62 +++++++++++++----------------------- 1 file changed, 22 insertions(+), 40 deletions(-) diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c index 19dd821155dd4..18f3cf94e8f71 100644 --- a/drivers/iio/health/afe4404.c +++ b/drivers/iio/health/afe4404.c @@ -460,39 +460,31 @@ static int afe4404_probe(struct i2c_client *client) afe->irq = client->irq; afe->regmap = devm_regmap_init_i2c(client, &afe4404_regmap_config); - if (IS_ERR(afe->regmap)) { - dev_err(dev, "Unable to allocate register map\n"); - return PTR_ERR(afe->regmap); - } + if (IS_ERR(afe->regmap)) + return dev_err_probe(dev, PTR_ERR(afe->regmap), + "Unable to allocate register map\n"); for (i = 0; i < F_MAX_FIELDS; i++) { afe->fields[i] = devm_regmap_field_alloc(dev, afe->regmap, afe4404_reg_fields[i]); - if (IS_ERR(afe->fields[i])) { - dev_err(dev, "Unable to allocate regmap fields\n"); - return PTR_ERR(afe->fields[i]); - } + if (IS_ERR(afe->fields[i])) + return dev_err_probe(dev, PTR_ERR(afe->fields[i]), + "Unable to allocate regmap fields\n"); } ret = devm_regulator_get_enable(dev, "tx_sup"); - if (ret) { - dev_err(dev, "Unable to enable regulator\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to enable regulator\n"); ret = regmap_write(afe->regmap, AFE440X_CONTROL0, AFE440X_CONTROL0_SW_RESET); - if (ret) { - dev_err(dev, "Unable to reset device\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to reset device\n"); ret = regmap_multi_reg_write(afe->regmap, afe4404_reg_sequences, ARRAY_SIZE(afe4404_reg_sequences)); - if (ret) { - dev_err(dev, "Unable to set register defaults\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to set register defaults\n"); indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->channels = afe4404_channels; @@ -505,43 +497,33 @@ static int afe4404_probe(struct i2c_client *client) "%s-dev%d", indio_dev->name, iio_device_id(indio_dev)); - if (!afe->trig) { - dev_err(dev, "Unable to allocate IIO trigger\n"); - return -ENOMEM; - } + if (!afe->trig) + return dev_err_probe(dev, -ENOMEM, "Unable to allocate IIO trigger\n"); iio_trigger_set_drvdata(afe->trig, indio_dev); ret = devm_iio_trigger_register(dev, afe->trig); - if (ret) { - dev_err(dev, "Unable to register IIO trigger\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to register IIO trigger\n"); ret = devm_request_threaded_irq(dev, afe->irq, iio_trigger_generic_data_rdy_poll, NULL, IRQF_ONESHOT, AFE4404_DRIVER_NAME, afe->trig); - if (ret) { - dev_err(dev, "Unable to request IRQ\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to request IRQ\n"); } ret = devm_iio_triggered_buffer_setup(dev, indio_dev, &iio_pollfunc_store_time, afe4404_trigger_handler, NULL); - if (ret) { - dev_err(dev, "Unable to setup buffer\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to setup buffer\n"); ret = devm_iio_device_register(dev, indio_dev); - if (ret) { - dev_err(dev, "Unable to register IIO device\n"); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "Unable to register IIO device\n"); return 0; } -- 2.39.2