From patchwork Mon Aug 28 15:56:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3466515vqm; Mon, 28 Aug 2023 10:08:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IERBES9+IOalcfidtG4C8zMu6YA9qXTHyjIxVDWm3AYofnDvHIu6Ari61h/WoYe8TmIxq+S X-Received: by 2002:a50:fb83:0:b0:523:bb8a:8dca with SMTP id e3-20020a50fb83000000b00523bb8a8dcamr19685853edq.16.1693242516207; Mon, 28 Aug 2023 10:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693242516; cv=none; d=google.com; s=arc-20160816; b=FNciUwZ8PdGw4NunbhohvsDu7q5L8nWrIk6oqXOzdOrdLWe6hG+KCcobbN3ZicyXq5 CFmlV8cA5NUN9Q+yQ9T8x11qh9Ahmx/Dzt7H5LVu7SMiiz1fL4lGmMssib8oJG+cAVzr k7P4fjqZf/1qabajgQ+ryPS8od36UejR2PiFS0U95yUVR+wpxPE/i0jqK+YKADFEXRz5 fWJuAY32+dEwRKC/zjT/8G5lNvJftGR1iEmdZ30Cw6kesydrcwJp5D/HjlGjySQE0GqS IEPuOkXC2o+rVukamXG8aZSPQHBv05oOeDyVX0Sda8CO73bBY+vs4LxPfcfpcIO/DfuS vk5g== 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=0jDEcWzZuhJqTisEUMyqjin3119f3znsJ+d+okTo0rE=; fh=K7TzmIZT5B1lycBQfsCiF4dq6OQCbe+LLVTZoxnlU0E=; b=oGMqdovBu6SqQfwtU+3lvWPm9xgS0So7yyVZMWNJGdE/X2zkPrBOWPRKacQ3vGb2Aw WzPVuU7+TKnJ80VMLa51WPMQ9r7C+S5qpGBKXEo6W6igvwoj33evJ7eXlJZFY/kBdBHX JfjwG8zZlAe8lM59Z3haEYtTxUlhKPbvsFp+MBs8fKuOVwXJQQGzs5Rw4BGxhkCVJuer FMhNfOpfECaG8xcAjDOS2Sc3ZLOQ2qRFm4XvLDSwINNjkSHTb9UbWKwcGb84oEsoLEvd sHd88gdlwlcEjad0GzwPb9nJtwN2KeLt3hkUmODUj7QzhU2389COVsXsIR5vPvtRbxOn xDzg== 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 j5-20020aa7c405000000b0052a41666b9asi4839454edq.72.2023.08.28.10.07.47; Mon, 28 Aug 2023 10:08:36 -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 S230338AbjH1P4d (ORCPT + 99 others); Mon, 28 Aug 2023 11:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232287AbjH1P4Z (ORCPT ); Mon, 28 Aug 2023 11:56:25 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 791BBA9 for ; Mon, 28 Aug 2023 08:56:22 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,207,1688396400"; d="scan'208";a="177937725" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 29 Aug 2023 00:56:21 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id E557F4009430; Tue, 29 Aug 2023 00:56:19 +0900 (JST) From: Biju Das To: Lee Jones Cc: Biju Das , patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, Andy Shevchenko , Charles Keepax Subject: [PATCH v2] mfd: arizona-i2c: Simplify probe() Date: Mon, 28 Aug 2023 16:56:17 +0100 Message-Id: <20230828155617.87068-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, 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: 1775493464751750223 X-GMAIL-MSGID: 1775493464751750223 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 Acked-by: Charles Keepax Tested-by: Charles Keepax --- Note: This patch is only compile tested. 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..5f830907d2e6 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 = (unsigned long)i2c_get_match_data(i2c); switch (type) { case WM5102: if (IS_ENABLED(CONFIG_MFD_WM5102))