From patchwork Thu Jun 29 10:46:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 114276 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp9557279vqr; Thu, 29 Jun 2023 04:13:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7WyVVFiZsWvsp+zuJ2ms60/3CJv7tCyiA3NHABYMWfb0mFxc5XbEqKqcOFZVPCgva4z+BI X-Received: by 2002:a17:90b:3a8a:b0:25b:e2e1:e252 with SMTP id om10-20020a17090b3a8a00b0025be2e1e252mr43873741pjb.3.1688037202327; Thu, 29 Jun 2023 04:13:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688037202; cv=none; d=google.com; s=arc-20160816; b=RYIJJgXP0mFA8YoPTGwjN68bKtOopDaqMEs/BfeMoXL+5ejqh4ZT8vKrqADMWgRG/3 DjVdUoTGcM5EayqdX2pyV0Arc3jnnxxemm+aGM/teNniOkNR7AtzPdemMxNzzAzULhyI uuhhOKEEPQSBKOFQQ6vQQiqtinvnIxt+j4d6IAPRa1WXrbA7dkt+twS8L5jD1kpnJQwG theBA+YNnASI+jb02PgJEwpxJ6M7Op6asuuJ05ghh1QCZxDM+HAVLqRKs459GjLBnzxu 1ULcHgymrye9tLYtYAmNybhod0X0LaVgdPfTsi2vMkOftr/tIOtobU7qHwLfToMk/srL YBYA== 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=boPtZ3de8dh1dRkr7WjJolRFozdrpf3OzLHSdERmKDw=; fh=24Z9D4DUVobL/KCVNZ58EGolLoePZ94P995JhaeZ02Y=; b=wi5y/NlPtd/dZXYJyqOApiJucIuAu0b70Ct3ZE3WLbZ3BxnfjAPUfrYB/a+bKoVl43 XOxsSOXNO8mSXn5yydkjQXvJRkWBoeTx8hTksmp5R1TmC0OXFNyKdMHUAoF+gEXs/UFW mjQtNISwN+SGA0G5FoGsCf6p4MctZ77bB7Kwbto8Rrh2KFIFodF06QAvrA/RnODe0acV QuIJWRaR+PmQloZwMNKcgDzRlT9EUVsEo2PMcMM3FaSIbMrxYK65RdPEnWqgFW5P7SQt /2jgaQ6opnURei/81p0ecRYwEcnOJ7MBCpaz8XUNIl9b/7vqKgzS7amQHePRcjGHR9T+ G4xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=NC4dWm3R; 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 d26-20020a631d5a000000b0053fb3688fadsi10857295pgm.144.2023.06.29.04.13.07; Thu, 29 Jun 2023 04:13:22 -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=NC4dWm3R; 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 S231961AbjF2KqW (ORCPT + 99 others); Thu, 29 Jun 2023 06:46:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231443AbjF2KqK (ORCPT ); Thu, 29 Jun 2023 06:46:10 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC5BF1FD7 for ; Thu, 29 Jun 2023 03:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688035568; x=1719571568; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bKELHWVc0gm7Wrq9rJb2qhEkSaXqfGvlib5oCM0+8EM=; b=NC4dWm3RfBfr0FsPmpM6hGaKa5KbmlU5hcLzLn+Qqo5JG/KQCW1taRdd 5LRkHC5sxQi52u4BKVcXa5w1XmU3awQxgPwCSgYitaiBE2312UtUL4MoY c5p7Diuv8dV7V7SVd+++3XsXwXbXqNcQqMupSUQLONoWru4Iep9bS0icn yesTQs2BJao/rbsj3mTqMkXtSTO6BQ8raKVGFVzLMHOp+DNpw6yr9B1k4 ccGlfVg30XjsnUcGet6LOaaN7qapWSDnwMBpzxwHgvA40LsuIQd/6fQ+Z WoS7f8nYzBGMX6ysOkIF7md+inKg3BnXy1Do+pIp0YdstXNbY4bb0LiSZ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="362115074" X-IronPort-AV: E=Sophos;i="6.01,168,1684825200"; d="scan'208";a="362115074" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jun 2023 03:46:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10755"; a="963948381" X-IronPort-AV: E=Sophos;i="6.01,168,1684825200"; d="scan'208";a="963948381" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 29 Jun 2023 03:46:04 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C55EC4DA; Thu, 29 Jun 2023 13:46:05 +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 v1 2/3] ASoC: rt5677: Use device_get_match_data() Date: Thu, 29 Jun 2023 13:46:02 +0300 Message-Id: <20230629104603.88612-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230629104603.88612-1-andriy.shevchenko@linux.intel.com> References: <20230629104603.88612-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 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?1770035297432036161?= X-GMAIL-MSGID: =?utf-8?q?1770035297432036161?= 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 4ef9c88cb20a..4d09eb2a0755 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 @@ -5559,6 +5557,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; @@ -5573,21 +5572,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); @@ -5702,7 +5689,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 944ae02aafc2..5ccdf1ba613a 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1753,8 +1753,8 @@ enum { }; enum rt5677_type { - RT5677, - RT5676, + RT5677 = 1, + RT5676 = 2, }; /* ASRC clock source selection */