From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E41DC433EF for ; Tue, 5 Jul 2022 15:58:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229978AbiGEP6P (ORCPT ); Tue, 5 Jul 2022 11:58:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230493AbiGEP6N (ORCPT ); Tue, 5 Jul 2022 11:58:13 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A96C266A for ; Tue, 5 Jul 2022 08:58:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657036692; x=1688572692; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=4UcFBdwVPNGp4VMF2eOGRnKawTrULmg2jhiKGa5OAmM=; b=fk8DD8g2x5zhV7Kd4eO0Tb4auvEtbc+O+jIrFtPlT2WNTuFQz19Xn1DF 7aNWrSnW4cOYDpUq+/vpqfxN7zguCVE3mU80badcg3adeZJwIONlQXWnE TD6p1dir5rjVM7qYx8kZUASNvYfVA0yrDtxgTwj4qvFvWiPrXYqz6z3u9 eRNOnkOPGM+9w0UtY+TZW4YKJQLNFWgq1unyhxV9f8+IcNlZn3LDUtZNM DhHgw7EAok4ueC20rWUoQ6/wdlKfl0jFQJY5/j9nP0lOhGkIJe/OdGQwv mz7Fv/y7QyflKRAbKICy8qa3273ww2NapWOdmz/Wiz3xaXig+YIlddGCc g==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="283416794" X-IronPort-AV: E=Sophos;i="5.92,247,1650956400"; d="scan'208";a="283416794" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 08:58:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,247,1650956400"; d="scan'208";a="919769341" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 05 Jul 2022 08:58:09 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id F069E1A0; Tue, 5 Jul 2022 18:58:15 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Liam Girdwood , Peter Ujfalusi , Bard Liao , Ranjani Sridharan , Kai Vehmanen , Mark Brown , Jaroslav Kysela , Takashi Iwai Subject: [PATCH v3 1/1] ASoC: Intel: catpt: remove duplicating driver data retrieval Date: Tue, 5 Jul 2022 18:58:13 +0300 Message-Id: <20220705155813.75917-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org device_get_match_data() in ACPI case calls similar to acpi_match_device(). Hence there is no need to duplicate the call. Just assign what is in the id->driver_data. Signed-off-by: Andy Shevchenko --- v3: moved spec assignment closer to its user (Péter, Czarek) sound/soc/intel/catpt/device.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/intel/catpt/device.c b/sound/soc/intel/catpt/device.c index 85a34e37316d..d48a71d2cf1e 100644 --- a/sound/soc/intel/catpt/device.c +++ b/sound/soc/intel/catpt/device.c @@ -254,14 +254,11 @@ static int catpt_acpi_probe(struct platform_device *pdev) return -ENODEV; } - spec = device_get_match_data(dev); - if (!spec) - return -ENODEV; - cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL); if (!cdev) return -ENOMEM; + spec = (const struct catpt_spec *)id->driver_data; catpt_dev_init(cdev, dev, spec); /* map DSP bar address */ -- 2.35.1