From patchwork Thu May 12 09:44:33 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: 1630054 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=pR5wfIYA; 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 4KzRjW16Dwz9sG2 for ; Thu, 12 May 2022 19:45:51 +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 1np5O9-0005aK-3H; Thu, 12 May 2022 09:45:41 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1np5Nz-0005Ml-MJ for kernel-team@lists.ubuntu.com; Thu, 12 May 2022 09:45:31 +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-0.canonical.com (Postfix) with ESMTPS id 41E1F3F1A1 for ; Thu, 12 May 2022 09:45:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1652348731; bh=dZuwBHNda+F4ncUaCiyjWzsonRP8JOtU2vdwJ5Q9bA0=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pR5wfIYAyXUf3Z03Y4MWz0vSimiwe6xnOjIIW0p3+iwVt5KrXD4uxO3zHvRdI04oJ PVoaGfPAXpk9T86p8uqhtaqPpTtsCADavFvmZo/vuVRRSiNXgiS3ZWf9f4aNR7qKCU rv7F2RALIE+zDxUGdyXd4qtE8x7Yh6ntHJVolMhslFiF7FUwpbz9SRruPZeC7eIYXs 1EGCAkDxHvZwXGESccnBfAhU6+RQumUiQtHsZlWlfiJ9DJu7Sp0yeV3LQsNihDYRJq 3S7LKHuXiFWLccwZH+LqEjgUjb8S7Ge3XBNRBsRRURrUG9eKp8GRXg/rxfJjXkUGFB 4QNM6Jm+H0AQw== Received: by mail-pl1-f200.google.com with SMTP id b10-20020a170902bd4a00b0015e7ee90842so2493738plx.8 for ; Thu, 12 May 2022 02:45:31 -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=dZuwBHNda+F4ncUaCiyjWzsonRP8JOtU2vdwJ5Q9bA0=; b=EqAUcvRgWE4YUEMqYOIQ9G3DZca12mT6ZruAyietJTxOcGqokUFcSmQ/T03hDAob/D DVCIzE+xvLGCxkCpD9BFr+vWWfsotUXK9KmWscp8hQbST+4tBRUnln+K08L6ICW4oGHz Zm6FbtJO0Zp20WptK9UptkVHQFLEDbYHhZDvyqP7Hp0jdN11hWRAhjwKiW7NYsSKw043 J4xxdnIqgCfDwqsqTpysKAOL9+9oiqtuwL5m7eLzwzek48JWldQzLhSA43MWj/CV4ATx 5GNhtCBQEUw5+Fwd311cfs2n3J/W/7jvAVsyKrC/BACaq2GueNN5DNGyNjhNo+PXDjT0 3HzA== X-Gm-Message-State: AOAM532kkDSZymmN4ehSjw3TWf5GmflEkGMtT/htT0YHo47YNY+D9LPa Vopz5Ap7AmnV1HkCYTR4o7Bm5JBQHzmYiSjRhq5/hwhJeFIaU1Fxs1rt/aJSgdB6zkCU6vG77Ms YG6ktdW/M4bt3f5G4zJXeoODtyyp10oel336XToE3uA== X-Received: by 2002:a05:6a00:2484:b0:510:7f57:30b7 with SMTP id c4-20020a056a00248400b005107f5730b7mr28934137pfv.70.1652348729764; Thu, 12 May 2022 02:45:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEV8J1Vbr0BP/mYK3B6rMR7KJonpGJ2t/JKb4F073gks+wtrdg0akT5xJDqfkcQYYGO0mBKQ== X-Received: by 2002:a05:6a00:2484:b0:510:7f57:30b7 with SMTP id c4-20020a056a00248400b005107f5730b7mr28934105pfv.70.1652348729328; Thu, 12 May 2022 02:45:29 -0700 (PDT) Received: from localhost.localdomain (36-230-93-232.dynamic-ip.hinet.net. [36.230.93.232]) by smtp.gmail.com with ESMTPSA id 1-20020a630901000000b003c18e0768e3sm1458038pgj.78.2022.05.12.02.45.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 May 2022 02:45:28 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [SRU][Jammy:linux-intel-iotg][PATCH v2 03/10] iio: accel: adxl345: Get rid of name parameter in adxl345_core_probe() Date: Thu, 12 May 2022 17:44:33 +0800 Message-Id: <20220512094440.15310-4-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220512094440.15310-1-jianhui.lee@canonical.com> References: <20220512094440.15310-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 As a preparation to switch to use device properties, get rid of name parameter in adxl345_core_probe(). Instead, choose it based on the type. Signed-off-by: Andy Shevchenko Tested-by: Kai-Heng Feng Link: https://lore.kernel.org/r/20220222090009.2060-3-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron (cherry picked from commit c1db3d5cab03a79947736c44fd33f19f234b14a0) Signed-off-by: Jian Hui Lee --- drivers/iio/accel/adxl345.h | 4 ++-- drivers/iio/accel/adxl345_core.c | 15 +++++++++++++-- drivers/iio/accel/adxl345_i2c.c | 3 +-- drivers/iio/accel/adxl345_spi.c | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/iio/accel/adxl345.h b/drivers/iio/accel/adxl345.h index 5a68d4dac717..b01cb0ccf8dc 100644 --- a/drivers/iio/accel/adxl345.h +++ b/drivers/iio/accel/adxl345.h @@ -13,7 +13,7 @@ enum adxl345_device_type { ADXL375 = 2, }; -int adxl345_core_probe(struct device *dev, struct regmap *regmap, - enum adxl345_device_type type, const char *name); +int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type); +int adxl345_core_remove(struct device *dev); #endif /* _ADXL345_H_ */ diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 59c508ac072e..c616dc024f2f 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -213,14 +213,25 @@ static void adxl345_powerdown(void *regmap) regmap_write(regmap, ADXL345_REG_POWER_CTL, ADXL345_POWER_CTL_STANDBY); } -int adxl345_core_probe(struct device *dev, struct regmap *regmap, - enum adxl345_device_type type, const char *name) +int adxl345_core_probe(struct device *dev, struct regmap *regmap, enum adxl345_device_type type) { struct adxl345_data *data; struct iio_dev *indio_dev; + const char *name; u32 regval; int ret; + switch (type) { + case ADXL345: + name = "adxl345"; + break; + case ADXL375: + name = "adxl375"; + break; + default: + return -EINVAL; + } + ret = regmap_read(regmap, ADXL345_REG_DEVID, ®val); if (ret < 0) return dev_err_probe(dev, ret, "Error reading device ID\n"); diff --git a/drivers/iio/accel/adxl345_i2c.c b/drivers/iio/accel/adxl345_i2c.c index 7feaaba865d3..31abdf6cc596 100644 --- a/drivers/iio/accel/adxl345_i2c.c +++ b/drivers/iio/accel/adxl345_i2c.c @@ -31,8 +31,7 @@ static int adxl345_i2c_probe(struct i2c_client *client, 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); + return adxl345_core_probe(&client->dev, regmap, id->driver_data); } static const struct i2c_device_id adxl345_i2c_id[] = { diff --git a/drivers/iio/accel/adxl345_spi.c b/drivers/iio/accel/adxl345_spi.c index 49625dfa109b..fefb99e00cb3 100644 --- a/drivers/iio/accel/adxl345_spi.c +++ b/drivers/iio/accel/adxl345_spi.c @@ -34,7 +34,7 @@ static int adxl345_spi_probe(struct spi_device *spi) 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); + return adxl345_core_probe(&spi->dev, regmap, id->driver_data); } static const struct spi_device_id adxl345_spi_id[] = {