From patchwork Mon Aug 28 17:24:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137082 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3559551vqm; Mon, 28 Aug 2023 13:18:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEjI+MbI/HcpoZ2PDJzR5kwudVILl2roe0FpqPnJIN2kn/ozWPJKsiiFEwS1FrmjzTSaZfw X-Received: by 2002:a17:906:74ca:b0:9a1:c337:8061 with SMTP id z10-20020a17090674ca00b009a1c3378061mr15054910ejl.8.1693253904137; Mon, 28 Aug 2023 13:18:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693253904; cv=none; d=google.com; s=arc-20160816; b=mNV6eLBMJ0k8y9UeUKcvR3gDYgIPbsDa4JEvRSEdA7AU3qGYuSWekAGIuZjMWZv3gV 7Sr92lU+ijJG+u7F+FejUm5Q03fAMP3ncqUG0Zy7mPlJFkqH6eD1hkmmMw4S55qeTt6J 2gEVJ/TvjJ5lEwtl+XJ4k0wrE8h1F9BARuiYKq5s9MjTjyIj8GSj0geJiX0j99B1Jnap KZOQ6+BXa8xttT0CWZdERhxsinNdo2nvzX9eAzc2pypejKJ2FUzqAUz/hxAbvntpAeun j1fFWCD6mv4x20linMnBM+R4paopInONW0Su/lWo8gyzQnPQtNyyzhqky4UEF+qgiFvs Vb8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=smAVkbKc072v+qtZ76HLKE5qXNMt7Ty7jMoOnRUxQ+o=; fh=D7X4m3h48WzxV5TdmXPiwihBUdg5PgMI8yRqASSjm0U=; b=Wqc6GkaW54M1kammTX0lO3/4pOgApRkk3CFyG+rGOu1cMx1f6YocJmqFgZ46wKMuXY PrsQrOUpOATQE3Z2syOU2N3hiy0kbRIA/wZtul/mWwpxdCApuCVN/VLr4mfEH+adz28D tQyxK8pajJ14EGYxYQNBnovpDFn8wkRzUm8LOZ0U2mju/ePp0vLZwc28ERir7JTimbFh CFPAKp3LI9IkQ982ploJKjNOQ85vKV9OGJxxZIoZvNyjr7vyvNRTNDuBBCU1wbfn1qWY xtIqUFKGgE6Q8hPfohrDdgIVs6dQmxEAX/HsZxVARSVzO/PeTqLH2oHQdivSj1/nvRBh pL4g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h17-20020a170906829100b00997e96fdb73si4845828ejx.296.2023.08.28.13.17.48; Mon, 28 Aug 2023 13:18:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232129AbjH1RYq (ORCPT + 99 others); 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 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1775505405974960565 X-GMAIL-MSGID: 1775505405974960565 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/pv88080-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, }; -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 = { .hvbuck_vsel_mask = PV88080_VHVBUCK_MASK, }; -#ifdef CONFIG_OF -static const struct of_device_id pv88080_dt_ids[] = { - { .compatible = "pvs,pv88080", .data = (void *)TYPE_PV88080_AA }, - { .compatible = "pvs,pv88080-aa", .data = (void *)TYPE_PV88080_AA }, - { .compatible = "pvs,pv88080-ba", .data = (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 = 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 = i2c_client_get_device_id(i2c); struct regulator_init_data *init_data = 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 = { }; int i, error, ret; unsigned int conf2, conf5; @@ -398,16 +381,9 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) return error; } - if (i2c->dev.of_node) { - match = 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 = (unsigned long)match->data; - } else { - chip->type = id->driver_data; - } + chip->regmap_config = i2c_get_match_data(i2c); + if (!chip->regmap_config) + return -ENODEV; i2c_set_clientdata(i2c, chip); @@ -452,15 +428,6 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) dev_warn(chip->dev, "No IRQ configured\n"); } - switch (chip->type) { - case TYPE_PV88080_AA: - chip->regmap_config = &pv88080_aa_regs; - break; - case TYPE_PV88080_BA: - chip->regmap_config = &pv88080_ba_regs; - break; - } - regmap_config = chip->regmap_config; config.dev = chip->dev; config.regmap = chip->regmap; @@ -546,11 +513,21 @@ static int pv88080_i2c_probe(struct i2c_client *i2c) return 0; } +#ifdef CONFIG_OF +static const struct of_device_id pv88080_dt_ids[] = { + { .compatible = "pvs,pv88080", .data = &pv88080_aa_regs }, + { .compatible = "pvs,pv88080-aa", .data = &pv88080_aa_regs }, + { .compatible = "pvs,pv88080-ba", .data = &pv88080_ba_regs }, + {} +}; +MODULE_DEVICE_TABLE(of, pv88080_dt_ids); +#endif + static const struct i2c_device_id pv88080_i2c_id[] = { - { "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);