Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3125614ybj; Mon, 23 Sep 2019 15:19:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+/AaK8Pctor4RX7jLrmsenQsbLCjpGFBOqNnApKgsmzYq8DOdSnJCni154uCBQf/K8zHz X-Received: by 2002:a17:906:f204:: with SMTP id gt4mr1763852ejb.299.1569277154173; Mon, 23 Sep 2019 15:19:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569277154; cv=none; d=google.com; s=arc-20160816; b=DBqNk3B5J3mkqsFvT4iU8n2/kcMxZoLA0x7qM34H5rdk4liyZSyd2sqlw3Q1gYmttX fqYcvFvLvPTqw46gQzcXqh5MLrpC+Zr6ZfyZiGtvHLFqZkB+AJMpMHsZ9218AsG0SDcz RU8QCDKzVPlxWzV0oxR/DvFjtmf0H/c6OuuZ6qhSibAEaaYI1KYwaboc1Zu2pUVnHpQt RjVkF73Gyes1r7AYh9DwYtOzKy+710vIhQfvMv4NiduF16t45Xelohb+THY496XJWFgC 44sBVaGsBXVmu5cEUlq7gNUgjC5c1XaJ747cRzkOQutkwt6IF2gKk/6Pc0x6K4KXprfe U1vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZqnUHzKm8fBjwo9QkoYRzy7JguDglCS95hf1ybL5VQ0=; b=xYXMdjK6KooKTUO26eBPw1ahnWSX2Ae+clJ66A63Vkx5QIykjcYOWnYnxFdwRRExGE kUGpdwQwFrKEjMXGBcnzmhA97h9YJAq6z8qb+HxcgXXZ3CDx7/euirk1wl1nqGNYebVP 0tUe2ISb/PBxUWMLDzdsSENOWKNiTtbmgJiYx0+vy0Uo267vhQHmTXPeE73DxrHpjzOZ 64sVMaiKlYwPdi5IidhR3nLumo+xY3plgr+qDH4AqFQ0KXqQLbASXXUd37W//cTYlztC iuIe2vJaoumXPE/B4GBGls9qeSalSO6Auie6sl4ZqNU3w2lIP9fAofZzRZbaodUyFVzj ZpFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jytDDgEq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d17si7764186eda.213.2019.09.23.15.18.50; Mon, 23 Sep 2019 15:19:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jytDDgEq; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391410AbfIVSsI (ORCPT + 99 others); Sun, 22 Sep 2019 14:48:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:44644 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391301AbfIVSsA (ORCPT ); Sun, 22 Sep 2019 14:48:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D185F214AF; Sun, 22 Sep 2019 18:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178079; bh=WsyQeQ0LKRlhdI1QG341Q+aStMLnCD6mISC3+nH3hEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jytDDgEqfa2iLz+pNYJQjygAWuhsdrLlM49yN8cJ9mpu+LFKw+5gpQi5IxO3Ixb2w A+o4EzXt+A0Jd8NvOqyrV44bkmU4fgPuyhOeYIlcXY50FE2DOruMekFxFuSmUlu9Nv r9s7yENdiZqRfK51ZOTwGFytq/7HGksjJ1MhCH5U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Cezary Rojewski , Pierre-Louis Bossart , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 5.3 150/203] ASoC: Intel: Haswell: Adjust machine device private context Date: Sun, 22 Sep 2019 14:42:56 -0400 Message-Id: <20190922184350.30563-150-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Cezary Rojewski [ Upstream commit ca964edf0ddbfec2cb10b3d251d09598e7ca9b13 ] Apart from Haswell machines, all other devices have their private data set to snd_soc_acpi_mach instance. Changes for HSW/ BDW boards introduced with series: https://patchwork.kernel.org/cover/10782035/ added support for dai_link platform_name adjustments within card probe routines. These take for granted private_data points to snd_soc_acpi_mach whereas for Haswell, it's sst_pdata instead. Change private context of platform_device - representing machine board - to address this. Fixes: e87055d732e3 ("ASoC: Intel: haswell: platform name fixup support") Fixes: 7e40ddcf974a ("ASoC: Intel: bdw-rt5677: platform name fixup support") Fixes: 2d067b2807f9 ("ASoC: Intel: broadwell: platform name fixup support") Signed-off-by: Cezary Rojewski Link: https://lore.kernel.org/r/20190822113616.22702-2-cezary.rojewski@intel.com Tested-by: Pierre-Louis Bossart Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/common/sst-acpi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/intel/common/sst-acpi.c b/sound/soc/intel/common/sst-acpi.c index 0e8e0a7a11df3..5854868650b9e 100644 --- a/sound/soc/intel/common/sst-acpi.c +++ b/sound/soc/intel/common/sst-acpi.c @@ -141,11 +141,12 @@ static int sst_acpi_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, sst_acpi); + mach->pdata = sst_pdata; /* register machine driver */ sst_acpi->pdev_mach = platform_device_register_data(dev, mach->drv_name, -1, - sst_pdata, sizeof(*sst_pdata)); + mach, sizeof(*mach)); if (IS_ERR(sst_acpi->pdev_mach)) return PTR_ERR(sst_acpi->pdev_mach); -- 2.20.1