From nobody Fri Dec 19 18:44:19 2025 Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) (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 A1F30D530; Wed, 8 May 2024 16:34:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715186082; cv=none; b=eC36jvm2jxdgaeG8qoN3bil71Qvk3P1mtU6IdVohBeNL1C8OLzPS9TxxM3o4C4wvAfpI28R/Fjkj+VgB0JXzyZvkNIyQJG5voL6ojwD4y5FDDHnpnVkhkcSNsg6XMefdSSrMCTO+q9e3eANKQg1QtZqnUBzMZRsoZFeDTAiC2+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715186082; c=relaxed/simple; bh=l1hu2hFgIr8xR8Q585mFsIg/KueTHwMCzDe3W804cQo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qnDHWWB2YGqLp4DxZZYVpzottaenJoj3RPgseZebcXM+LM2cs2Wv+ZbPiPvVq0mPf3WRyFVnoEQ3loFMHHAYPNhsAi3epNxeE1p21chcVJuT7jSA8ajAosJEpJEp0JoepsszDK/+EiRl97LaUkUSBgWqGsDArytubm+KuFdiPaM= 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=bXeNgfNP; arc=none smtp.client-ip=209.85.218.49 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="bXeNgfNP" Received: by mail-ej1-f49.google.com with SMTP id a640c23a62f3a-a59a9d66a51so1062388566b.2; Wed, 08 May 2024 09:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715186079; x=1715790879; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yp+nY7e7eZPYh86CGgOdapTFik7EaeHR+9gwGoRC30w=; b=bXeNgfNPXrqbEfaZNkn2Cxl68dXrfLKpPzevgWqTvTu/DzZ+6RkDCzxQNo4PakSleV KO6QTRXSSZXSb4OH8tjjbNxm8JlYoQOrdAwwhK8txTkrV4keEVwed59kDottX1e755n+ y8eqZRq4LHXArTBKH+k8yFIqo6CqhKHelTXYsXUcGlG6PycGO10A62/hhMgSTfH+syUF lnNs+GJSELuH8KOp1MvtMLNRBPSc9zEEspa6wo4+KlKRlZmGFVrvj5HFs6svJ5Uua36k qMmImO2DZ01LXyG/4LePu3wkGHWJILP6rA7jzm8uwAikG7F8ZIThmXXj5z0Pu0ZxcpUH ekkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715186079; x=1715790879; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yp+nY7e7eZPYh86CGgOdapTFik7EaeHR+9gwGoRC30w=; b=qSh8mb0zTdLL60QKiKV+SU2wKoXNDqiNDogz4kG3pb4NYYvZZDiyOD3wOsUSHguz0m QfbPMgoRgHakyytQrgdZgJhxieYNDwLrRqgoKHspQZF+TpDOjtqRIUO2H+/zhDirp3Ta DoBVqoW3PptPs79OHQaq83SH5MEruhTImJI5PtCrgYn37FRR3bJTgAWwAmKysZN2/tEw 2wv/m+tMtHdx5ELpM4ewmx9ea8lfPRuMNGh53Nc+szOexmG4IRFSEA/agOpXXg+z7LjY 3CtTIVASA29QvIiRzlV/w0PT9RMVBTq45WLQtIUbkAwf7Sth6lEDP6HIVOEogFBPqnTs r/VA== X-Forwarded-Encrypted: i=1; AJvYcCXn17+CYCCZQ9bcUjZNLpTNHx/AKQ+xRuSN/ilX9B5fGliYwVlGlmRLU4VZQ17FZ9B15xODcm5VCdkCbWHIDBZ7TrojNyVJYjZZ1ElROkMAHf4nnB+cEXN2bgkvxZQfcPinWP/lU7RQ X-Gm-Message-State: AOJu0YwzuT9uJpHwIVPPg+B2alw8+d4luRq3hwvi82fYWHK10D7d0JWI XCYIVyYYeU6K7enFKLB1qRNoXjrBJJofR/zTebJ6lu2oiFq49lax X-Google-Smtp-Source: AGHT+IEMC+Dw6E0shnC6gqT8Dba4dvjJdbcXyWzO52XHNNJSV03Leno0HXRIYguTo6n57F1jQ50P3g== X-Received: by 2002:a17:906:509:b0:a59:c23d:85d8 with SMTP id a640c23a62f3a-a59fb9cf5admr200982066b.51.1715186078659; Wed, 08 May 2024 09:34:38 -0700 (PDT) Received: from localhost.localdomain ([2a04:ee41:82:7577:a3c8:644e:cd04:560a]) by smtp.gmail.com with ESMTPSA id hb4-20020a170906b88400b00a5599f3a057sm7872843ejb.107.2024.05.08.09.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 09:34:38 -0700 (PDT) From: Vasileios Amoiridis To: jic23@kernel.org Cc: lars@metafoo.de, andriy.shevchenko@linux.intel.com, ang.iglesiasg@gmail.com, mazziesaccount@gmail.com, ak@it-klinger.de, petre.rodan@subdimension.ro, phil@raspberrypi.com, 579lpy@gmail.com, linus.walleij@linaro.org, semen.protsenko@linaro.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Vasileios Amoiridis Subject: [PATCH 2/9] iio: pressure: bmp280: Remove, add and update error messages Date: Wed, 8 May 2024 18:34:18 +0200 Message-Id: <20240508163425.143831-3-vassilisamir@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240508163425.143831-1-vassilisamir@gmail.com> References: <20240508163425.143831-1-vassilisamir@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove duplicate error messages, add missing error messages and update redundant ones. Signed-off-by: Vasileios Amoiridis --- drivers/iio/pressure/bmp280-core.c | 55 +++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp2= 80-core.c index 311a011604da..0aa16fb135c1 100644 --- a/drivers/iio/pressure/bmp280-core.c +++ b/drivers/iio/pressure/bmp280-core.c @@ -222,10 +222,8 @@ static int bme280_read_calib(struct bmp280_data *data) =20 /* Load shared calibration params with bmp280 first */ ret =3D bmp280_read_calib(data); - if (ret < 0) { - dev_err(dev, "failed to read calibration parameters\n"); + if (ret < 0) return ret; - } =20 /* * Read humidity calibration values. @@ -841,8 +839,10 @@ static int bme280_chip_config(struct bmp280_data *data) */ ret =3D regmap_update_bits(data->regmap, BME280_REG_CTRL_HUMIDITY, BME280_OSRS_HUMIDITY_MASK, osrs); - if (ret < 0) + if (ret < 0) { + dev_err(data->dev, "failed to set humidity oversampling"); return ret; + } =20 return bmp280_chip_config(data); } @@ -1071,7 +1071,7 @@ static int bmp380_read_calib(struct bmp280_data *data) sizeof(data->bmp380_cal_buf)); if (ret) { dev_err(data->dev, - "failed to read temperature calibration parameters\n"); + "failed to read calibration parameters\n"); return ret; } =20 @@ -1609,20 +1609,24 @@ static int bmp580_preinit(struct bmp280_data *data) =20 /* Post powerup sequence */ ret =3D regmap_read(data->regmap, BMP580_REG_CHIP_ID, ®); - if (ret) + if (ret) { + dev_err(data->dev, "failed to establish comms with the chip\n"); return ret; + } =20 /* Print warn message if we don't know the chip id */ if (reg !=3D BMP580_CHIP_ID && reg !=3D BMP580_CHIP_ID_ALT) - dev_warn(data->dev, "preinit: unexpected chip_id\n"); + dev_warn(data->dev, "unexpected chip_id\n"); =20 ret =3D regmap_read(data->regmap, BMP580_REG_STATUS, ®); - if (ret) + if (ret) { + dev_err(data->dev, "failed to read nvm status\n"); return ret; + } =20 /* Check nvm status */ if (!(reg & BMP580_STATUS_NVM_RDY_MASK) || (reg & BMP580_STATUS_NVM_ERR_M= ASK)) { - dev_err(data->dev, "preinit: nvm error on powerup sequence\n"); + dev_err(data->dev, "nvm error on powerup sequence\n"); return -EIO; } =20 @@ -1657,6 +1661,10 @@ static int bmp580_chip_config(struct bmp280_data *da= ta) BMP580_DSP_COMP_MASK | BMP580_DSP_SHDW_IIR_TEMP_EN | BMP580_DSP_SHDW_IIR_PRESS_EN, reg_val); + if (ret) { + dev_err(data->dev, "failed to change DSP mode settings\n"); + return ret; + } =20 /* Configure oversampling */ reg_val =3D FIELD_PREP(BMP580_OSR_TEMP_MASK, data->oversampling_temp) | @@ -1778,8 +1786,10 @@ static int bmp180_wait_for_eoc(struct bmp280_data *d= ata, u8 ctrl_meas) reinit_completion(&data->done); =20 ret =3D regmap_write(data->regmap, BMP280_REG_CTRL_MEAS, ctrl_meas); - if (ret) + if (ret) { + dev_err(data->dev, "failed to write crtl_meas register\n"); return ret; + } =20 if (data->use_eoc) { /* @@ -1802,12 +1812,16 @@ static int bmp180_wait_for_eoc(struct bmp280_data *= data, u8 ctrl_meas) } =20 ret =3D regmap_read(data->regmap, BMP280_REG_CTRL_MEAS, &ctrl); - if (ret) + if (ret) { + dev_err(data->dev, "failed to read ctrl_meas register\n"); return ret; + } =20 /* The value of this bit reset to "0" after conversion is complete */ - if (ctrl & BMP180_MEAS_SCO) + if (ctrl & BMP180_MEAS_SCO) { + dev_err(data->dev, "conversion didn't complete\n"); return -EIO; + } =20 return 0; } @@ -1824,8 +1838,10 @@ static int bmp180_read_adc_temp(struct bmp280_data *= data, int *val) =20 ret =3D regmap_bulk_read(data->regmap, BMP180_REG_OUT_MSB, &data->be16, sizeof(data->be16)); - if (ret) + if (ret) { + dev_err(data->dev, "failed to read temperature\n"); return ret; + } =20 *val =3D be16_to_cpu(data->be16); =20 @@ -1840,9 +1856,10 @@ static int bmp180_read_calib(struct bmp280_data *dat= a) =20 ret =3D regmap_bulk_read(data->regmap, BMP180_REG_CALIB_START, data->bmp180_cal_buf, sizeof(data->bmp180_cal_buf)); - - if (ret < 0) + if (ret < 0) { + dev_err(data->dev, "failed to read calibration parameters\n"); return ret; + } =20 /* None of the words has the value 0 or 0xFFFF */ for (i =3D 0; i < ARRAY_SIZE(data->bmp180_cal_buf); i++) { @@ -1925,8 +1942,10 @@ static int bmp180_read_adc_press(struct bmp280_data = *data, int *val) =20 ret =3D regmap_bulk_read(data->regmap, BMP180_REG_OUT_MSB, data->buf, sizeof(data->buf)); - if (ret) + if (ret) { + dev_err(data->dev, "failed to read pressure\n"); return ret; + } =20 *val =3D get_unaligned_be24(data->buf) >> (8 - oss); =20 @@ -2158,8 +2177,10 @@ int bmp280_common_probe(struct device *dev, data->regmap =3D regmap; =20 ret =3D regmap_read(regmap, data->chip_info->id_reg, &chip_id); - if (ret < 0) + if (ret < 0) { + dev_err(data->dev, "failed to read chip id\n"); return ret; + } =20 for (i =3D 0; i < data->chip_info->num_chip_id; i++) { if (chip_id =3D=3D data->chip_info->chip_id[i]) { --=20 2.25.1