From patchwork Sat Sep 23 17:49:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp303194vqu; Sat, 23 Sep 2023 10:50:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFOvTkDmMLvd6kZUMM+QlgrxcrmN65mADgHgsXKOh9h4xc8OzFzQ7wE+20lNIH4MVBnuCck X-Received: by 2002:a17:902:b697:b0:1c5:64aa:b97a with SMTP id c23-20020a170902b69700b001c564aab97amr1902657pls.38.1695491409646; Sat, 23 Sep 2023 10:50:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695491409; cv=none; d=google.com; s=arc-20160816; b=V86Csikdz7NnNWx5dBYErR58uRXdZFFZ5ndIH6gXaHVT0YpYP0wvE8Gwo5TAVxPo9q T7u00SkNLdOO9vFybzKAdPea8bai/mlhxKOz/Xa1Drk1hxrgTx7FoPW1qLiiWKh064/t pwAeEa1SDTMODmjy6HMbhWkjfL22Gzsld1EsAaMpEkGNgHuXXLR/qL53zC+9LhKNtGCJ 0g3o8H7cMtbGJqJJZR+1BdxNZC2Y4UE1495ojSB4j+fesy3HuRdacld9WFtLNoJnRi4h v3fGWnEr/qcx+XXdHuRgj+3UpqEGtoDDTAnFoCi22n7M/7CZlf6cA0F9R1AyQI03mYu9 kYbw== 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=WRWjNBlM6dtv1iP8Xu0NBXk7q5FQuQDWT+RgpNs0rgk=; fh=1qz5Pfm/JcLX63bfALOa3wJ+yBN40cfw5RWdoNyTBwo=; b=I7PpPedr6ikkRY/GP1LXjynqlH//1YrXgLrOqBL8pHYCvecg3KzIwxRNZUZZ5Kz1Y7 JPq/M1NKSTTNSS1WR56bU7pkqKGDpnmmZyPBUmL+TtwWiLel76wr1iBM7Yyh6s9jpdP3 XdCCr70ybQIHYqTOXQLZ/7EIyA0w0wu2mA+v5yaAvKMLa0zq6K70GqYkM3/LoAEwAaQL XOAu/CNjyZrqXIUjI9FtOr6D0XkQnnQ5lxdgStXvw8kgoteQQNjih/eWJ+9+wehGei2T b8Dq6aptSw/YvelVMbVWm51agwZgmNH/rb8eNayz9YZCaDzj3dIqKG+4BeKIsAN2mZ9m f9Rg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id j4-20020a170903028400b001b9d2010c39si6607782plr.192.2023.09.23.10.50.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:50:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id AE10782E079C; Sat, 23 Sep 2023 10:50:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232170AbjIWRtv (ORCPT + 30 others); Sat, 23 Sep 2023 13:49:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232199AbjIWRtn (ORCPT ); Sat, 23 Sep 2023 13:49:43 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 3F385127 for ; Sat, 23 Sep 2023 10:49:37 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="180730425" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:36 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 599A440061B8; Sun, 24 Sep 2023 02:49:34 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko , Charles Keepax Subject: [PATCH v4 1/4] mfd: arizona-i2c: Simplify obtaining I2C match data Date: Sat, 23 Sep 2023 18:49:25 +0100 Message-Id: <20230923174928.56824-2-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> References: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 23 Sep 2023 10:50:07 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777851600627860216 X-GMAIL-MSGID: 1777851600627860216 Simplify probe() by replacing device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). After this drop intializing the variable type. Signed-off-by: Biju Das Acked-by: Charles Keepax Tested-by: Charles Keepax --- Note: This patch is only compile tested. v3->v4: * Updated commit header and description. v2->v3: * Used uintptr_t for enum casting. v1->v2: * Added Ack and Tested-by tag from Charles Keepax * Dropped unnecessary blank line before switch statement. --- drivers/mfd/arizona-i2c.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index 9b7183ffc928..10e76fc8f12e 100644 --- a/drivers/mfd/arizona-i2c.c +++ b/drivers/mfd/arizona-i2c.c @@ -22,19 +22,12 @@ static int arizona_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id = i2c_client_get_device_id(i2c); - const void *match_data; struct arizona *arizona; const struct regmap_config *regmap_config = NULL; - unsigned long type = 0; + unsigned long type; int ret; - match_data = device_get_match_data(&i2c->dev); - if (match_data) - type = (unsigned long)match_data; - else if (id) - type = id->driver_data; - + type = (uintptr_t)i2c_get_match_data(i2c); switch (type) { case WM5102: if (IS_ENABLED(CONFIG_MFD_WM5102)) From patchwork Sat Sep 23 17:49:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp303114vqu; Sat, 23 Sep 2023 10:49:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEaPtn6FFgq+n2g86RLVTIRf11fKR+wP+YpyZOKac0qw8U2bCSxd/ZkZSXxU0YuvazZzSP4 X-Received: by 2002:a05:6871:594:b0:1db:3031:c97c with SMTP id u20-20020a056871059400b001db3031c97cmr3333955oan.26.1695491396336; Sat, 23 Sep 2023 10:49:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695491396; cv=none; d=google.com; s=arc-20160816; b=zUIb3UFYHxh0IYyuZzydbHsU0LKAGF12S1b2UvrkZmTL4Cc2EoA6R1y8nkoXXUEF9W 2d8quFWiZtvHsCP0RtYJYXF1bwuvPXpTkxU/4qWlbdQB0AfBEHpebzprsl4VvAaWxKVV hvOemlzBDhD3uUaJ5Q+UmORAKW7g/8LCDtO6gjdGU+c5WKuksRx4GvyD32FyL1zEah6R HlxWJHvZ/7m4LIMvXKiXiwtDhhPwXkjeF+kDy6XStPfzpkPCdisVamb8LEwOv1hUJxRn yOnkU/jEhzu1v811NvZ/1QN1Q9QbsgtUY3j05xjZjuMX7DE2NFdMO4bWSWpc5lA6MWK1 D2/w== 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=Jbmk+C5LHt/M21cyFQykBV0UWQhV4oIStAq5Cgf4DUo=; fh=I9Ehjxm498n/bZbFzcVJzYOYZVfj5ieX4tvCNWeI0l8=; b=hLdTeEJ1ztSCq4QCtXk52yPSIRZdmiSBJSZ+cgDJFeCTVpCiUAWoCu0G/lLb3+xxbV W33HEYDMRwK6+DO5Vh1VG0NpfLPKmKoCOAAza16U2jDyAHmH4p3BBFzUHYDN6EJwG5Jh nlJTPGVAs796PDy5FSxCMdVq16nX9++XDsaT3hlXzgK+mxgkN5Hubk2PgDnNFeS9dMK5 GxMRkclWvdd1rWc6xQ0pU0mdvQnzG4inCLEJ6nBn2+r/e5MH61sWa8+95fZjzcKrIWRN VULRkXqJQD4l0I1seDa+vd0t4yR7GoVuyKGov4ejWHFpW/biANfQPMbn4FqWQ6kfJP0y ZSbg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id w4-20020a634744000000b00578d5a135dasi6331370pgk.891.2023.09.23.10.49.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:49:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B2ACF8031ACC; Sat, 23 Sep 2023 10:49:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232204AbjIWRt4 (ORCPT + 30 others); Sat, 23 Sep 2023 13:49:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232224AbjIWRtq (ORCPT ); Sat, 23 Sep 2023 13:49:46 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 503F7127 for ; Sat, 23 Sep 2023 10:49:40 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="176997671" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:40 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 33C794005B3D; Sun, 24 Sep 2023 02:49:36 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , Charles Keepax , Richard Fitzgerald , alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v4 2/4] mfd: madera-i2c: Simplify obtaining I2C match data Date: Sat, 23 Sep 2023 18:49:26 +0100 Message-Id: <20230923174928.56824-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> References: <20230923174928.56824-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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 23 Sep 2023 10:49:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777851586370035003 X-GMAIL-MSGID: 1777851586370035003 Simplify probe() by replacing of_device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). Signed-off-by: Biju Das Acked-by: Charles Keepax --- Note: This patch is only compile tested. v3->v4: * Updated commit header. v2->v3: * Used uintptr_t for enum casting. v1->v2: * Added Ack tag from Charles Keepax. * Dropped blank line before switch statement. --- drivers/mfd/madera-i2c.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c index a404ea26bc79..0986e4a99f4a 100644 --- a/drivers/mfd/madera-i2c.c +++ b/drivers/mfd/madera-i2c.c @@ -18,21 +18,14 @@ static int madera_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct madera *madera; const struct regmap_config *regmap_16bit_config = NULL; const struct regmap_config *regmap_32bit_config = NULL; - const void *of_data; unsigned long type; const char *name; int ret; - of_data = of_device_get_match_data(&i2c->dev); - if (of_data) - type = (unsigned long)of_data; - else - type = id->driver_data; - + type = (uintptr_t)i2c_get_match_data(i2c); switch (type) { case CS47L15: if (IS_ENABLED(CONFIG_MFD_CS47L15)) { From patchwork Sat Sep 23 17:49:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143970 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp303178vqu; Sat, 23 Sep 2023 10:50:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEB0biWCDB878jtPK1y4Jm1VdzjMgLH/fb1/nDxeE0PXXHbUQzI/Kd8yT3DOwj7FvOphIA0 X-Received: by 2002:a05:6a00:3982:b0:690:ce36:8b00 with SMTP id fi2-20020a056a00398200b00690ce368b00mr3433410pfb.2.1695491405766; Sat, 23 Sep 2023 10:50:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695491405; cv=none; d=google.com; s=arc-20160816; b=QTjCUrcDIMeqh35O+/0MILaI9uK6jGRWdOI1waIvifoFfVZLJInLGqvLT0ufkarSbZ aG0ag/hchMINx7ouNiQiw8SzkbhYuLbcwrma2iuw5MM6rFNfONOis36JVE84jTVJoCMO kvzjjmj1+4+51B8PMcGOXE4fN7rYpFuL2OeBlBAYuv0fZV6NXpK1d/aGX+y0sgs8V1MU nAOOd5ylUMAaZkXkSbPvnwZtbiBXw8oM4jeaG+eQfa6Te6frQvi71mZXXWkmiGxd5Mgu ADxjMhkffmhyVMHHB/Vknsk8m3/jxsBEwjAF5PUhYqr/R7SZ6fYGD3yvubpJ4ex4YqIr 9Jnw== 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=ksCbcH4GuO6DEiQtdmGVjNfmTYXOU943NKdgeTRF7w4=; fh=pw+dqyfPdSov6fSSng5jSNKgho3EaeZzx+IVU5xkcn4=; b=x13T9huA4ebPOvMUxlZHiKeJbhhEzaM6MT3yDUuZrXfyHRH4SIoQXjccx1e0sOneXe ktH2UailRCh7avuSCSm6Cz8CBn4wjs4BjHQ/W/lsNoajzkdORNIux1xYmFzcdjNA1QS3 7GYh+7NCybgSB8AkflAtZaRvgF7zZSm6HbocCbQEQaF5A9Fv/Akp8cOjSnRqZypoRQ3m PFuup/4c222cN6yfckUIr3gvU0zxsFc2rmuWEb+2Op40KMor7834HQfW6fjowSCBRlwm Y+WvlODFWQhr4t7qWxaHGfAa5pJ1hasiwc8G6OQ3BjgWcq0nrSXQ8ujnqHAmNdFwNsw2 pkYg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id y6-20020a63e246000000b00570505c5267si6511331pgj.262.2023.09.23.10.50.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:50:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 4D60A82E07A7; Sat, 23 Sep 2023 10:50:03 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232208AbjIWRt6 (ORCPT + 30 others); Sat, 23 Sep 2023 13:49:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232132AbjIWRts (ORCPT ); Sat, 23 Sep 2023 13:49:48 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 941E6136 for ; Sat, 23 Sep 2023 10:49:42 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="180730429" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:42 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 99B6340061B8; Sun, 24 Sep 2023 02:49:40 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v4 3/4] mfd: max77541: Simplify obtaining I2C match data Date: Sat, 23 Sep 2023 18:49:27 +0100 Message-Id: <20230923174928.56824-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> References: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 23 Sep 2023 10:50:03 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777851596275126283 X-GMAIL-MSGID: 1777851596275126283 Simplify probe() by replacing device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). Signed-off-by: Biju Das --- Note: This patch is only compile tested. v3->v4: * Updated commit header. v2->v3: * Restored OF table. v1->v2: * Restored error code -EINVAL. --- drivers/mfd/max77541.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/mfd/max77541.c b/drivers/mfd/max77541.c index 10c2e274b4af..d77c31c86e43 100644 --- a/drivers/mfd/max77541.c +++ b/drivers/mfd/max77541.c @@ -162,7 +162,6 @@ static int max77541_pmic_setup(struct device *dev) static int max77541_probe(struct i2c_client *client) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device *dev = &client->dev; struct max77541 *max77541; @@ -173,10 +172,7 @@ static int max77541_probe(struct i2c_client *client) i2c_set_clientdata(client, max77541); max77541->i2c = client; - max77541->id = (uintptr_t)device_get_match_data(dev); - if (!max77541->id) - max77541->id = (enum max7754x_ids)id->driver_data; - + max77541->id = (uintptr_t)i2c_get_match_data(client); if (!max77541->id) return -EINVAL; From patchwork Sat Sep 23 17:49:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 143969 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp303158vqu; Sat, 23 Sep 2023 10:50:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH72ojuFGfHrtKv8Ex+rVCm3/c//LMgJDKbeFhrteLQQDHuqbRIFKHhWZ7MSPuDUgiEvVkX X-Received: by 2002:a05:6870:c14b:b0:1d0:f067:bf23 with SMTP id g11-20020a056870c14b00b001d0f067bf23mr3445645oad.25.1695491402446; Sat, 23 Sep 2023 10:50:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695491402; cv=none; d=google.com; s=arc-20160816; b=RDFupd1vnMmsDjh4nqGOaz9rndWlrgCTcq0BzF/S1TeGTtHhyMezHY9uil5ncZBj3/ DnG6bGeqhlWo1qxDsDce3Zr8ftqDcq8WThSNmph3M2gxemY37pc4C14XQwvPggA7ILZF czQqs1Jq2YcwlxQlGCyIikLHQnP5Xe7fdvfGhjgkAgPyXSCc98KAQnozMDjjnDBoRcbC HnKvZyn+GQhJuqgd+jwHQmfNd4SmmEM6K7xxU3J7UNvYgfmtbHpGPYdjM/8fs0qOhTuA BfcKYmtyltXerArQ+1k827I8vZ5CmzwcWUWGQU95bQ9LSzX6v+TkStOSuJjKRDyAp6Jl D8cg== 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=Cz/cDrQEcfC24KkKX794rkamU74WF1+qDJPII1Lzajc=; fh=pw+dqyfPdSov6fSSng5jSNKgho3EaeZzx+IVU5xkcn4=; b=yjWOCSnVMSn0GU9F8quDObhuWZCK917wy9S/KRgXxuDVmGJdOzI3lcZpmH49njcrDJ Z22wE19/B7K7/nVf+PHEwTKEOcHKDZz4jCgKRLmgLjD6WWUULbhClwxHAXFUoUHatb2A xQCLq+mIEypay0eVZPz1joHwclRDjnQFM63wYXLlcSsaHkvNnw/1l4OP29AaYJo9NeOC 4G/ZibUpJ/5ysOW33pXHMe6XakPnHmmxDNOGQT+KcuyZ6NOvZJuWYIg3C4mRus+JWrdR lmqcUOCYMlzZPlhvZJd4iHUSDbdukYJZl8QiuHq4JTM3CWw3dwom+My6c1LT02qTY/V0 Xpzw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b5-20020a633405000000b005775302b11csi3253848pga.81.2023.09.23.10.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Sep 2023 10:50:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 31DAD802F19A; Sat, 23 Sep 2023 10:50:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232220AbjIWRuB (ORCPT + 30 others); Sat, 23 Sep 2023 13:50:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232164AbjIWRtv (ORCPT ); Sat, 23 Sep 2023 13:49:51 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E7D4E136 for ; Sat, 23 Sep 2023 10:49:44 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,171,1694703600"; d="scan'208";a="176997674" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie5.idc.renesas.com with ESMTP; 24 Sep 2023 02:49:44 +0900 Received: from localhost.localdomain (unknown [10.226.92.12]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id EC22740061B8; Sun, 24 Sep 2023 02:49:42 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v4 4/4] mfd: max8998: Simplify obtaining I2C match data and drop max8998_i2c_get_driver_data() Date: Sat, 23 Sep 2023 18:49:28 +0100 Message-Id: <20230923174928.56824-5-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230923174928.56824-1-biju.das.jz@bp.renesas.com> References: <20230923174928.56824-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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 23 Sep 2023 10:50:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777851592847962053 X-GMAIL-MSGID: 1777851592847962053 Simplify probe() by using i2c_get_match_data() instead of max8998_i2c_get_driver_data() for retrieving match data from OF/ID tables. Signed-off-by: Biju Das Reviewed-by: Andy Shevchenko --- Note: This patch is only compile tested. v3->v4: * Updated commit header. V2->v3: * Added Rb tag from Andy. v1->v2: * Used uintptr_t for enum casting. --- drivers/mfd/max8998.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c index 4cc426a6c767..6ba27171da28 100644 --- a/drivers/mfd/max8998.c +++ b/drivers/mfd/max8998.c @@ -152,18 +152,8 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata( return pd; } -static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client *i2c, - const struct i2c_device_id *id) -{ - if (i2c->dev.of_node) - return (unsigned long)of_device_get_match_data(&i2c->dev); - - return id->driver_data; -} - static int max8998_i2c_probe(struct i2c_client *i2c) { - const struct i2c_device_id *id = i2c_client_get_device_id(i2c); struct max8998_platform_data *pdata = dev_get_platdata(&i2c->dev); struct max8998_dev *max8998; int ret = 0; @@ -183,7 +173,7 @@ static int max8998_i2c_probe(struct i2c_client *i2c) max8998->dev = &i2c->dev; max8998->i2c = i2c; max8998->irq = i2c->irq; - max8998->type = max8998_i2c_get_driver_data(i2c, id); + max8998->type = (uintptr_t)i2c_get_match_data(i2c); max8998->pdata = pdata; if (pdata) { max8998->ono = pdata->ono;