From patchwork Sun Sep 3 16:03:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp679366vqo; Sun, 3 Sep 2023 10:11:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGiSDjAk9oOskEkEIElbZPLSwXmT7ZzvCpTRd9IZyudKi7XalR4nL0l7DWI+Mk9Z83pnbrS X-Received: by 2002:aa7:d316:0:b0:523:3e27:caa7 with SMTP id p22-20020aa7d316000000b005233e27caa7mr7164737edq.20.1693761068504; Sun, 03 Sep 2023 10:11:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693761068; cv=none; d=google.com; s=arc-20160816; b=uIQjLnW40f7U88e7EnLSClHQ/hlKc+zG2g8AnXp9CGpgEti+Y6mf838LE05O1px/za n4f80P5GRp9upwQwAZesticv/MJzGtXxx5rAEr0yH14oQxksH1Ra8aOGnkQfvZcGfCtS xMu69mi/GNlF+IouIxGxbpTqpJkqIJEDiMXFMJ3ArSzTOGwnULgbrgZDPcNsahrOOcyI SStJrbeKBxXyEmE0xiTxhUrOn/bIjHMKOpkK9KZfeAMEDrTSyP0BT5twh7JyLp4rzgCV pTvFGNoCGXdZSpVF8vnhglQgFy1BcjCkifOGdSo1YnvUdh92yjkgXiqHvkxQoe7es2Z5 i5Eg== 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 :message-id:date:subject:cc:to:from; bh=jJdDMUrX2cdHYaosf44YTB/U+q0lrXO9t2KnFSOD11s=; fh=I8/zrvfRW7rg9yyi822nupjjNdfXw6G98ght6DExHZE=; b=qYWVP7UIaOFAlXp2fxOL/dSeNexmKTwkmKvxm1IdmFLKjeAOFtxCryPyj+HzvaXvNN XMAvAGSHb2LQvK5+qEchDY9uuV9o7Is5vn+FNWlKdrwOjBnVjhxPwLBjpGhRmLnavKgv mmdzTSZbcJYW/40tibshPqEXekrmrwx1MuKHNe9FL+jDRWlRY5RFY5P/KQ8fb2Z6YqLN wYKfc+NguQA5TNuVtbSoVhD5p1oYa8YBR1F3MpuQeBxL3VIuB0vpx55XKJE0G1dzDPNI wRmgnUks5ehLN4uEG9vISch8EAbmKWdlOGxLyqDljEE8VwJzjumqZNkaTbsohxM6hCd8 p4vA== 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 ek14-20020a056402370e00b0052c6f388682si3172396edb.568.2023.09.03.10.10.38; Sun, 03 Sep 2023 10:11:08 -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 S244118AbjICQDO (ORCPT + 99 others); Sun, 3 Sep 2023 12:03:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232636AbjICQDO (ORCPT ); Sun, 3 Sep 2023 12:03:14 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 35A35100 for ; Sun, 3 Sep 2023 09:03:09 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,224,1688396400"; d="scan'208";a="178558807" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 04 Sep 2023 01:03:08 +0900 Received: from localhost.localdomain (unknown [10.226.92.30]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id 2A61F4011DF1; Mon, 4 Sep 2023 01:03:05 +0900 (JST) From: Biju Das To: Saravanan Sekar Cc: Biju Das , Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v2] regulator: mp5416: Make similar OF and ID table Date: Sun, 3 Sep 2023 17:03:01 +0100 Message-Id: <20230903160301.79111-1-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=AC_FROM_MANY_DOTS,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: 1776037205774671539 X-GMAIL-MSGID: 1776037205774671539 Make similar OF and ID table to extend support for ID match using i2c_match_data(). Currently it works only for OF match tables as the driver_data is wrong for ID match. While at it, remove trailing comma in the terminator entry for OF/ID table and drop a space from terminator entry for ID table. Signed-off-by: Biju Das --- Note: This patch is only compile tested. v1->v2: * Removed trailing comma in the terminator entry for OF/ID table and drop a space from terminator entry for ID table. --- drivers/regulator/mp5416.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/regulator/mp5416.c b/drivers/regulator/mp5416.c index d068ac93d373..3457e650a994 100644 --- a/drivers/regulator/mp5416.c +++ b/drivers/regulator/mp5416.c @@ -200,7 +200,7 @@ static int mp5416_i2c_probe(struct i2c_client *client) return PTR_ERR(regmap); } - desc = of_device_get_match_data(dev); + desc = i2c_get_match_data(client); if (!desc) return -ENODEV; @@ -223,14 +223,14 @@ static int mp5416_i2c_probe(struct i2c_client *client) static const struct of_device_id mp5416_of_match[] = { { .compatible = "mps,mp5416", .data = &mp5416_regulators_desc }, { .compatible = "mps,mp5496", .data = &mp5496_regulators_desc }, - {}, + {} }; MODULE_DEVICE_TABLE(of, mp5416_of_match); static const struct i2c_device_id mp5416_id[] = { - { "mp5416", }, - { "mp5496", }, - { }, + { "mp5416", (kernel_ulong_t)&mp5416_regulators_desc }, + { "mp5496", (kernel_ulong_t)&mp5496_regulators_desc }, + {} }; MODULE_DEVICE_TABLE(i2c, mp5416_id);