From nobody Thu Dec 18 16:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E46DFC83F16 for ; Mon, 28 Aug 2023 17:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232357AbjH1RYq (ORCPT ); Mon, 28 Aug 2023 13:24:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231501AbjH1RY2 (ORCPT ); Mon, 28 Aug 2023 13:24:28 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C2A51E1 for ; Mon, 28 Aug 2023 10:24:25 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,208,1688396400"; d="scan'208";a="177943377" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 29 Aug 2023 02:24:24 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id E786B402D0C9; Tue, 29 Aug 2023 02:24:22 +0900 (JST) From: Biju Das To: Liam Girdwood , Mark Brown Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2 1/2] regulator: pv880x0: Simplify probe() Date: Mon, 28 Aug 2023 18:24:16 +0100 Message-Id: <20230828172417.113631-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230828172417.113631-1-biju.das.jz@bp.renesas.com> References: <20230828172417.113631-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Replace pv88080_types->pv88080_compatible_regmap in OF/ID tables and simplify the probe() by replacing of_match_node() and ID lookup for retrieving match data by i2c_get_match_data(). After this there is no user of enum pv88080_types. So drop it. While at it, remove trailing comma in the terminator entry for OF/ID tables. Signed-off-by: Biju Das --- v1->v2: * Moved OF/ID tables close to the user * Removed trailing comma in the terminator entry for OF/ID tables. --- drivers/regulator/pv88080-regulator.c | 57 ++++++++------------------- 1 file changed, 17 insertions(+), 40 deletions(-) diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88= 080-regulator.c index 7ab3e4a9bd28..4009239b6784 100644 --- a/drivers/regulator/pv88080-regulator.c +++ b/drivers/regulator/pv88080-regulator.c @@ -28,11 +28,6 @@ enum { PV88080_ID_HVBUCK, }; =20 -enum pv88080_types { - TYPE_PV88080_AA, - TYPE_PV88080_BA, -}; - struct pv88080_regulator { struct regulator_desc desc; unsigned int mode_reg; @@ -196,16 +191,6 @@ static const struct pv88080_compatible_regmap pv88080_= ba_regs =3D { .hvbuck_vsel_mask =3D PV88080_VHVBUCK_MASK, }; =20 -#ifdef CONFIG_OF -static const struct of_device_id pv88080_dt_ids[] =3D { - { .compatible =3D "pvs,pv88080", .data =3D (void *)TYPE_PV88080_AA }, - { .compatible =3D "pvs,pv88080-aa", .data =3D (void *)TYPE_PV88080_AA }, - { .compatible =3D "pvs,pv88080-ba", .data =3D (void *)TYPE_PV88080_BA }, - {}, -}; -MODULE_DEVICE_TABLE(of, pv88080_dt_ids); -#endif - static unsigned int pv88080_buck_get_mode(struct regulator_dev *rdev) { struct pv88080_regulator *info =3D rdev_get_drvdata(rdev); @@ -376,11 +361,9 @@ static irqreturn_t pv88080_irq_handler(int irq, void *= data) */ static int pv88080_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id =3D i2c_client_get_device_id(i2c); struct regulator_init_data *init_data =3D dev_get_platdata(&i2c->dev); struct pv88080 *chip; const struct pv88080_compatible_regmap *regmap_config; - const struct of_device_id *match; struct regulator_config config =3D { }; int i, error, ret; unsigned int conf2, conf5; @@ -398,16 +381,9 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) return error; } =20 - if (i2c->dev.of_node) { - match =3D of_match_node(pv88080_dt_ids, i2c->dev.of_node); - if (!match) { - dev_err(chip->dev, "Failed to get of_match_node\n"); - return -EINVAL; - } - chip->type =3D (unsigned long)match->data; - } else { - chip->type =3D id->driver_data; - } + chip->regmap_config =3D i2c_get_match_data(i2c); + if (!chip->regmap_config) + return -ENODEV; =20 i2c_set_clientdata(i2c, chip); =20 @@ -452,15 +428,6 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) dev_warn(chip->dev, "No IRQ configured\n"); } =20 - switch (chip->type) { - case TYPE_PV88080_AA: - chip->regmap_config =3D &pv88080_aa_regs; - break; - case TYPE_PV88080_BA: - chip->regmap_config =3D &pv88080_ba_regs; - break; - } - regmap_config =3D chip->regmap_config; config.dev =3D chip->dev; config.regmap =3D chip->regmap; @@ -546,11 +513,21 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) return 0; } =20 +#ifdef CONFIG_OF +static const struct of_device_id pv88080_dt_ids[] =3D { + { .compatible =3D "pvs,pv88080", .data =3D &pv88080_aa_regs }, + { .compatible =3D "pvs,pv88080-aa", .data =3D &pv88080_aa_regs }, + { .compatible =3D "pvs,pv88080-ba", .data =3D &pv88080_ba_regs }, + {} +}; +MODULE_DEVICE_TABLE(of, pv88080_dt_ids); +#endif + static const struct i2c_device_id pv88080_i2c_id[] =3D { - { "pv88080", TYPE_PV88080_AA }, - { "pv88080-aa", TYPE_PV88080_AA }, - { "pv88080-ba", TYPE_PV88080_BA }, - {}, + { "pv88080", (kernel_ulong_t)&pv88080_aa_regs }, + { "pv88080-aa", (kernel_ulong_t)&pv88080_aa_regs }, + { "pv88080-ba", (kernel_ulong_t)&pv88080_ba_regs }, + {} }; MODULE_DEVICE_TABLE(i2c, pv88080_i2c_id); =20 --=20 2.25.1 From nobody Thu Dec 18 16:39:53 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F4081C83F15 for ; Mon, 28 Aug 2023 17:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232086AbjH1RYp (ORCPT ); Mon, 28 Aug 2023 13:24:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231728AbjH1RY3 (ORCPT ); Mon, 28 Aug 2023 13:24:29 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 14B9D103 for ; Mon, 28 Aug 2023 10:24:26 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,208,1688396400"; d="scan'208";a="177943381" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 29 Aug 2023 02:24:26 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 34B01402D0BB; Tue, 29 Aug 2023 02:24:24 +0900 (JST) From: Biju Das To: Liam Girdwood , Mark Brown Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2 2/2] regulator: pv880x0: Drop CONFIG_OF ifdeffery Date: Mon, 28 Aug 2023 18:24:17 +0100 Message-Id: <20230828172417.113631-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230828172417.113631-1-biju.das.jz@bp.renesas.com> References: <20230828172417.113631-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Get rid of ugly CONFIG_OF ifdeffery by adding mod_devicetable.h include. Suggested-by: Andy Shevchenko Signed-off-by: Biju Das --- v2: * New patch. --- drivers/regulator/pv88080-regulator.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/pv88080-regulator.c b/drivers/regulator/pv88= 080-regulator.c index 4009239b6784..2404df78d639 100644 --- a/drivers/regulator/pv88080-regulator.c +++ b/drivers/regulator/pv88080-regulator.c @@ -5,6 +5,7 @@ =20 #include #include +#include #include #include #include @@ -513,7 +514,6 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) return 0; } =20 -#ifdef CONFIG_OF static const struct of_device_id pv88080_dt_ids[] =3D { { .compatible =3D "pvs,pv88080", .data =3D &pv88080_aa_regs }, { .compatible =3D "pvs,pv88080-aa", .data =3D &pv88080_aa_regs }, @@ -521,7 +521,6 @@ static const struct of_device_id pv88080_dt_ids[] =3D { {} }; MODULE_DEVICE_TABLE(of, pv88080_dt_ids); -#endif =20 static const struct i2c_device_id pv88080_i2c_id[] =3D { { "pv88080", (kernel_ulong_t)&pv88080_aa_regs }, @@ -535,7 +534,7 @@ static struct i2c_driver pv88080_regulator_driver =3D { .driver =3D { .name =3D "pv88080", .probe_type =3D PROBE_PREFER_ASYNCHRONOUS, - .of_match_table =3D of_match_ptr(pv88080_dt_ids), + .of_match_table =3D pv88080_dt_ids, }, .probe =3D pv88080_i2c_probe, .id_table =3D pv88080_i2c_id, --=20 2.25.1