From patchwork Fri Jun 30 17:21:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 114834 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10544237vqr; Fri, 30 Jun 2023 10:35:52 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6EXx4VqlN5Ae4Ca51NdgLyA9ihWiMpmnXivxHp3+GRB6oVC2auyokUjHKeqY2rubcLcgMV X-Received: by 2002:a05:6a20:b910:b0:127:5d58:a7e1 with SMTP id fe16-20020a056a20b91000b001275d58a7e1mr2568387pzb.52.1688146552220; Fri, 30 Jun 2023 10:35:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688146552; cv=none; d=google.com; s=arc-20160816; b=lQ3TATHuyC+4PiSbHzfVR1n1Gu1i+0BDXoB3ZTgTYt+yr1PJiIudIff58QWR9kmkpJ X6LZ4H+IhafkDiyIqFURsLuAmrVa94DM0XlQknREPICoYd4zfdumZ/EjA5SsE9mCx5sD 1p9+o8vXd+vhIKYhm9bir3m7In9NRysUjkFPCn89XdRKgldr8erY4L/lHCrmHhm9aMFE j4p52QeT6VwiYa7uQYXdS3fLKNXgx3DO4K/R3zqMpj1w1SYmU4rz/2dGeRaIAi4wE+fE gVUcxFHr0h8hQX5bRVUuPUBNOxxD5TVlq8DvNoFCmYwc8MBiPPY94Vb8PbWVAGLkcxxB ZLew== 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 :dkim-signature; bh=+YqeKCCCFIh4YWLEsgHwepQ8OpeKyt3L6XQ4wLizjlc=; fh=24Z9D4DUVobL/KCVNZ58EGolLoePZ94P995JhaeZ02Y=; b=nOnGhi6C4p9U+cyRihjGXAr/r4ag7UTbRrF7O11wUTTbZBSHSjgoUyQhW03jVlTq+B ork9d6R+t0Mhms5sXizBz1cDHha9VNnMs0qJHw7FPJ7IN936IlZPAs9lA0qDZuZtwdLI Pv5d/YT79IlzIjuTokXJnp/acWhpOoqUPAcSo2/NlmYBFXNjPe4xX2WjXrsNP8vFygsV MJG9lSEd5D4Jk7t4QDp8wanLMc8nf9CevObjGLO0lrxrx01eJxRnAm1nHSp7XM3xaIlP +CudZhIDqCa3VTHyUU9vId7ORmvnILA95kvtp33IjYHpxo30xpvBQO5pqTKhI8p9td3D kc2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DqtypnIM; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id be23-20020a056a001f1700b0064378bea76dsi10471874pfb.239.2023.06.30.10.35.39; Fri, 30 Jun 2023 10:35:52 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=DqtypnIM; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232883AbjF3RWP (ORCPT + 99 others); Fri, 30 Jun 2023 13:22:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39764 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232793AbjF3RWI (ORCPT ); Fri, 30 Jun 2023 13:22:08 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03654421F for ; Fri, 30 Jun 2023 10:21:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688145718; x=1719681718; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Xfinsx2cbNjgygxyV5dAX8kY09FdNFlEzPlxBJeXw0c=; b=DqtypnIMIof3PuovmXvz1BV39KBnJilJF3fquNMTlGZLyisk8F0K6jFY Lwd1lNWMw4JWupzJ0m2bhXjWimmkOHVNQbVFc8Xf8x/O1ok/PmLQw64y+ eyv2JHBv96+YgAgq+zZeTpSDW3ed0z20wiZQGfsqzQMEvIYhcOyaX2DXA hby126NWEaEtrs8Vrzt620FrZOcH0tFQnrGQk3mtg9adY/HXt/JCDBiUa c2zxE95wRF2tofJ463LcP8JHHXQXCCoD1mDcu+Nbpn/HTauaVNfbgSMqY CuMTW8kHtNSPIqaZNxZJfGROSGdjgrTXfSfwmKlYlFA6CHBfQAHHdU3Ad w==; X-IronPort-AV: E=McAfee;i="6600,9927,10757"; a="361298319" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="361298319" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2023 10:21:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10757"; a="747486144" X-IronPort-AV: E=Sophos;i="6.01,171,1684825200"; d="scan'208";a="747486144" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 30 Jun 2023 10:21:55 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id E97F5516; Fri, 30 Jun 2023 20:21:57 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Oder Chiou , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v2 3/4] ASoC: rt5677: Use device_get_match_data() Date: Fri, 30 Jun 2023 20:21:54 +0300 Message-Id: <20230630172155.83754-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230630172155.83754-1-andriy.shevchenko@linux.intel.com> References: <20230630172155.83754-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770149959002040149?= X-GMAIL-MSGID: =?utf-8?q?1770149959002040149?= Use device_get_match_data() to simplify the code. Signed-off-by: Andy Shevchenko --- sound/soc/codecs/rt5677.c | 21 ++++----------------- sound/soc/codecs/rt5677.h | 4 ++-- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 17d5dd5d2974..b0c15e27c763 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -6,7 +6,6 @@ * Author: Oder Chiou */ -#include #include #include #include @@ -18,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -5531,6 +5529,7 @@ static int rt5677_init_irq(struct i2c_client *i2c) static int rt5677_i2c_probe(struct i2c_client *i2c) { + struct device *dev = &i2c->dev; struct rt5677_priv *rt5677; int ret; unsigned int val; @@ -5545,21 +5544,9 @@ static int rt5677_i2c_probe(struct i2c_client *i2c) INIT_DELAYED_WORK(&rt5677->dsp_work, rt5677_dsp_work); i2c_set_clientdata(i2c, rt5677); - if (i2c->dev.of_node) { - const struct of_device_id *match_id; - - match_id = of_match_device(rt5677_of_match, &i2c->dev); - if (match_id) - rt5677->type = (enum rt5677_type)match_id->data; - } else if (ACPI_HANDLE(&i2c->dev)) { - const struct acpi_device_id *acpi_id; - - acpi_id = acpi_match_device(rt5677_acpi_match, &i2c->dev); - if (acpi_id) - rt5677->type = (enum rt5677_type)acpi_id->driver_data; - } else { + rt5677->type = (enum rt5677_type)(uintptr_t)device_get_match_data(dev); + if (rt5677->type == 0) return -EINVAL; - } rt5677_read_device_properties(rt5677, &i2c->dev); @@ -5674,7 +5661,7 @@ static struct i2c_driver rt5677_i2c_driver = { .driver = { .name = RT5677_DRV_NAME, .of_match_table = rt5677_of_match, - .acpi_match_table = ACPI_PTR(rt5677_acpi_match), + .acpi_match_table = rt5677_acpi_match, }, .probe = rt5677_i2c_probe, .remove = rt5677_i2c_remove, diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index 5932b04cf85e..d67ebae067d9 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1691,8 +1691,8 @@ enum { }; enum rt5677_type { - RT5677, - RT5676, + RT5677 = 1, + RT5676 = 2, }; /* ASRC clock source selection */