From patchwork Mon May 9 09:13:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1628421 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=caNCUCt8; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kxb8Y19gjz9sGP for ; Mon, 9 May 2022 19:14:21 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nnzT5-0001Ln-CV; Mon, 09 May 2022 09:14:15 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nnzT3-0001Kk-9h for kernel-team@lists.ubuntu.com; Mon, 09 May 2022 09:14:13 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id F25073F1CA for ; Mon, 9 May 2022 09:14:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652087653; bh=9nJxXzeYoeitdz3l+UFg4fQj0jKQVHiW2/L2b4k50qQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=caNCUCt8Esbmy9z+bdgFF6lcjWHuvdCideysZdQDyD5WpLD6cdQUfkbqecJ7ULBtN cvtzfNAJAwvmLHRGDsmlJ4A/Me9IppTfIoHduOM0cecY5paTabS0IC4ZKME+EUdjYl E1dZxmNuC5PcaXEu7atcsUq8n21ye3vSUkRC10Q/D0F1sUI+SNKIonOXjmYyAAyPCJ OfF8hEw4xOQGi9sEVPTEmSQEfRPcljs+ZxxVx2UOHLn/+DjkRRQbYdozJ+pEpSDrQe OWHbjMiPmDT02JDAdmzpdo2I2LnTB1C5Migl8H9kwqNbtboCGb0vMacHsyp+N9L97O 87efg8QGyGkhw== Received: by mail-pl1-f200.google.com with SMTP id x4-20020a170902ec8400b0015f0c1ec803so1921279plg.15 for ; Mon, 09 May 2022 02:14:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9nJxXzeYoeitdz3l+UFg4fQj0jKQVHiW2/L2b4k50qQ=; b=6+PsxZfBxm6dxc4/24CTz+wwW5wHn/QdEXtkngOd/SfxanHj1bCQ0pQkizkjGnwlPf MTNXVvI/GQ9GaAPff7BZDC1lI6WjjQJuUQJkUQi7l/+V4ndebh5hqoIP+j1ttAxgRaVp uawtEPy6JFMNwj1BAI5HvAH0QZdn3GrTIvGwsIkSYEdyEe4awu9fBvPPVQ7gjQ/sH9sU 36naM16NLDxeF5k25BU+qCEduAVPBX5K/nP/NfK8cwX5wqf0qCfCe065XJOSCYYyP9Vz lEnI4gpGOkjF3lAxwQBQlmXoJZBTBYsFEuDhsQehmugQbti9ms+VAHCWGtGZFem5R102 r0YA== X-Gm-Message-State: AOAM531x3yIHm9WRJxg5vKSlbGDMXG/hv1aiDJLF5z+Mfo7IYIaKboMX hKgDcE0cJWNcd7MDI0dEPhzLRWV0fEiuGBl0Knh40J5uS1rYvvIoNdeDYZYKxv3ryqlUwLvuhgU fmAer0d02qjCO5dPEwXgoMHl2eBKCl3KgShOWx3P8PA== X-Received: by 2002:a63:4e4d:0:b0:3c6:51ec:724c with SMTP id o13-20020a634e4d000000b003c651ec724cmr11250156pgl.297.1652087651560; Mon, 09 May 2022 02:14:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrEbmQfNoPWATda85cF0OTdMB57QiIfQleJ0XKj2ftB9qMgjj6HOvTJwvUfsSZ/NTQX1fy3A== X-Received: by 2002:a63:4e4d:0:b0:3c6:51ec:724c with SMTP id o13-20020a634e4d000000b003c651ec724cmr11250140pgl.297.1652087651323; Mon, 09 May 2022 02:14:11 -0700 (PDT) Received: from Razer-Stealth.. (36-230-106-94.dynamic-ip.hinet.net. [36.230.106.94]) by smtp.gmail.com with ESMTPSA id r1-20020a170902c7c100b0015e8d4eb2e9sm6437057pla.307.2022.05.09.02.14.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 May 2022 02:14:10 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Focal:linux-intel-iotg-5.15][PATCH 01/10] iio: accel: adxl345: Convert to use dev_err_probe() Date: Mon, 9 May 2022 17:13:57 +0800 Message-Id: <20220509091406.39552-2-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220509091406.39552-1-jianhui.lee@canonical.com> References: <20220509091406.39552-1-jianhui.lee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andy Shevchenko BugLink: https://launchpad.net/bugs/1962674 It's fine to call dev_err_probe() in ->probe() when error code is known. Convert the driver to use dev_err_probe(). Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-1-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit 01676b0f3b625a9aa608d5b716898e9dba2fb63e) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345_core.c | 26 +++++++++----------------- drivers/iio/accel/adxl345_i2c.c | 7 ++----- drivers/iio/accel/adxl345_spi.c | 15 +++++---------- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 4b275051ef61..59c508ac072e 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -222,16 +222,12 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, int ret; ret = regmap_read(regmap, ADXL345_REG_DEVID, ®val); - if (ret < 0) { - dev_err(dev, "Error reading device ID: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Error reading device ID\n"); - if (regval != ADXL345_DEVID) { - dev_err(dev, "Invalid device ID: %x, expected %x\n", - regval, ADXL345_DEVID); - return -ENODEV; - } + if (regval != ADXL345_DEVID) + return dev_err_probe(dev, -ENODEV, "Invalid device ID: %x, expected %x\n", + regval, ADXL345_DEVID); indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); if (!indio_dev) @@ -245,10 +241,8 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT, data->data_range); - if (ret < 0) { - dev_err(dev, "Failed to set data range: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to set data range\n"); indio_dev->name = name; indio_dev->info = &adxl345_info; @@ -259,10 +253,8 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap, /* Enable measurement mode */ ret = regmap_write(data->regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_MEASURE); - if (ret < 0) { - dev_err(dev, "Failed to enable measurement mode: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to enable measurement mode\n"); ret = devm_add_action_or_reset(dev, adxl345_powerdown, data->regmap); if (ret < 0) diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index a431cba216e6..4363d5bd2ee9 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -28,11 +28,8 @@ static int adxl345_i2c_probe(struct i2c_client *client, return -ENODEV; regmap = devm_regmap_init_i2c(client, &adxl345_i2c_regmap_config); - if (IS_ERR(regmap)) { - dev_err(&client->dev, "Error initializing i2c regmap: %ld\n", - PTR_ERR(regmap)); - return PTR_ERR(regmap); - } + if (IS_ERR(regmap)) + return dev_err_probe(&client->dev, PTR_ERR(regmap), "Error initializing regmap\n"); return adxl345_core_probe(&client->dev, regmap, id->driver_data, id->name); diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index ea559ac2e87d..f590215f0d52 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -26,18 +26,13 @@ static int adxl345_spi_probe(struct spi_device *spi) struct regmap *regmap; /* Bail out if max_speed_hz exceeds 5 MHz */ - if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) { - dev_err(&spi->dev, "SPI CLK, %d Hz exceeds 5 MHz\n", - spi->max_speed_hz); - return -EINVAL; - } + if (spi->max_speed_hz > ADXL345_MAX_SPI_FREQ_HZ) + return dev_err_probe(&spi->dev, -EINVAL, "SPI CLK, %d Hz exceeds 5 MHz\n", + spi->max_speed_hz); regmap = devm_regmap_init_spi(spi, &adxl345_spi_regmap_config); - if (IS_ERR(regmap)) { - dev_err(&spi->dev, "Error initializing spi regmap: %ld\n", - PTR_ERR(regmap)); - return PTR_ERR(regmap); - } + if (IS_ERR(regmap)) + return dev_err_probe(&spi->dev, PTR_ERR(regmap), "Error initializing regmap\n"); return adxl345_core_probe(&spi->dev, regmap, id->driver_data, id->name); }