From patchwork Mon Aug 28 16:47:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a7d1:0:b0:3f2:4152:657d with SMTP id p17csp3476416vqm; Mon, 28 Aug 2023 10:26:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHvcdZD+zOHtVl+hqH5A+mBpQkphZxMkUzagUx8q0QwA5XJXr3xC3rAWjMMZPNN0wzQO6WM X-Received: by 2002:a05:6830:1b65:b0:6b9:cba0:93a9 with SMTP id d5-20020a0568301b6500b006b9cba093a9mr12570583ote.31.1693243604863; Mon, 28 Aug 2023 10:26:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693243604; cv=none; d=google.com; s=arc-20160816; b=YP6M/mV5JP3P4KYQN9v4vDuz+JmgVl0EbCpxFgyIu5TrbOnha/9sXt57ByQFuJx8cp dScR4w7R9UM74yMYh95s7QXoHFRJxwC+vs6yqIYdyiomt8H3xwZPOWwiAR4z2qqPVGE2 r4rwsGjKnOwRflC5p8sfGETHsO8jnVihDwqMRfbe5MSj669xpJTx0I4uEmNannj1yIFe 2ShcqmjqOYWqGBSa7yo0cLJuphLrU3roTYKsiNKpRmXOg/UJWoVYDZGYKk2tZn8TA8tR 4+NrGzbEE2yIe4O16HGPsrnrzy9FzjN+s1su7l175sLBNJXh1k+lulqsKF7NqWXLg6XY LtoA== 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=4VFa9zJ8sC1FwIJjB1hrJ4T2Ii2MW+zTFn4bXDIvfmM=; fh=D7X4m3h48WzxV5TdmXPiwihBUdg5PgMI8yRqASSjm0U=; b=wMO99HeoRTK5oUpZFjKeTdacuVtfThkD4I3vT6yAkr+Bx7tkcvJDFh3Wqj0gKvmi7e unt2DughE/Yt7J8W3SryP6q7HfFBhdOvUvXOfnIavZ44Kolya1dS8RBFWaA4Aa5lhHjl yTjmcpQ+pWq0sa4SZHjWCxqlN3SlY4OFMnZ44PGAYX6T6L9Aa/mhQx5zwgYDhQp+e1s7 VhosRALJ2Y9ue3rkSIXU1G7NSCyZ0XKzCcQFVI3ULew3Arcza6OEYSo3J77S63rQUsEj tcV3jHLnp7rcDgXzhWaizO2iJX4mFOQS2qAFAIikmvM5O9pvaya/+N15wzZsXGJnH7UZ eRsA== 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 y184-20020a638ac1000000b005694b757228si7939982pgd.688.2023.08.28.10.26.19; Mon, 28 Aug 2023 10:26:44 -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 S232550AbjH1QsD (ORCPT + 99 others); Mon, 28 Aug 2023 12:48:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232755AbjH1Qry (ORCPT ); Mon, 28 Aug 2023 12:47:54 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5D31313D for ; Mon, 28 Aug 2023 09:47:51 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,208,1688396400"; d="scan'208";a="177940765" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 29 Aug 2023 01:47:50 +0900 Received: from localhost.localdomain (unknown [10.226.92.234]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 1F16A4000F90; Tue, 29 Aug 2023 01:47:48 +0900 (JST) From: Biju Das To: Liam Girdwood , Mark Brown Cc: Biju Das , linux-kernel@vger.kernel.org, Andy Shevchenko Subject: [PATCH v2] regulator: fan53555: Simplify probe() Date: Mon, 28 Aug 2023 17:47:46 +0100 Message-Id: <20230828164746.102992-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: 1775494606324431534 X-GMAIL-MSGID: 1775494606324431534 Simplify probe() by replacing of_device_get_match_data() and ID lookup for retrieving match data by i2c_get_match_data(). While at it, use dev_fwnode() API instead of 'client->dev.of_node'. Signed-off-by: Biju Das --- Note: This patch is only compile tested. v1->v2: * Used uintptr_t for enum casting. * Replaced 'client->dev.of_node'->dev_fwnode(). --- drivers/regulator/fan53555.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c index 48f312167e53..17c9bf204385 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c @@ -659,7 +659,6 @@ MODULE_DEVICE_TABLE(of, fan53555_dt_ids); static int fan53555_regulator_probe(struct i2c_client *client) { - const struct i2c_device_id *id = i2c_client_get_device_id(client); struct device_node *np = client->dev.of_node; struct fan53555_device_info *di; struct fan53555_platform_data *pdata; @@ -682,10 +681,8 @@ static int fan53555_regulator_probe(struct i2c_client *client) "Platform data not found!\n"); di->regulator = pdata->regulator; - if (client->dev.of_node) { - di->vendor = - (unsigned long)of_device_get_match_data(&client->dev); - } else { + di->vendor = (uintptr_t)i2c_get_match_data(client); + if (!dev_fwnode(&client->dev)) { /* if no ramp constraint set, get the pdata ramp_delay */ if (!di->regulator->constraints.ramp_delay) { if (pdata->slew_rate >= ARRAY_SIZE(slew_rates)) @@ -695,8 +692,6 @@ static int fan53555_regulator_probe(struct i2c_client *client) di->regulator->constraints.ramp_delay = slew_rates[pdata->slew_rate]; } - - di->vendor = id->driver_data; } regmap = devm_regmap_init_i2c(client, &fan53555_regmap_config);