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 X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA4F1C072B5 for ; Tue, 21 May 2019 20:32:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BF8A42183F for ; Tue, 21 May 2019 20:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558470779; bh=cgc3tu8U1dqVszkDccx0X8afdetJxKlNGRqe9zW1O+k=; h=From:To:Cc:Subject:In-Reply-To:Date:List-ID:From; b=q3x/U2rKPS9AYAXlinZgwPk4y4/nWupjlGr73ZomKSezw5hZp0u9IUF46zS9B3/m9 P3xU2lHDNM3xsyIKrsxQaK91lBuNTPt732ZmWnKvEUpCPvBa6WGFsTbPsimqGddkPE mSuQD9PCfeubk2/ijeVw5Vl3PfJlX9iWBzaTw8KU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727777AbfEUUc7 (ORCPT ); Tue, 21 May 2019 16:32:59 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:38262 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727627AbfEUUc6 (ORCPT ); Tue, 21 May 2019 16:32:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=yBoefPM/+aGORt6Hgixp/+uCtlOxgYGxahQmeI0dtAs=; b=wESFLjIqIe0u eGA9FHtoZ1KP+sLH7YXjUL9t1g7FTUmxwRds0m6BQYEPCCaX5yucmDqifQbY51ifcZ3irEtj/D322 jKO3w7qu7+2tdf3Ax0xpKZIAGavbEsPOfU4YSEo2SK+LvaWyJIaHLUPMbycJVKTmABZmoQx3HlZo7 OKdAc=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1hTBRI-0001yk-05; Tue, 21 May 2019 20:32:48 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 280541126D21; Tue, 21 May 2019 21:32:43 +0100 (BST) From: Mark Brown To: Amir Goldstein Cc: alsa-devel@alsa-project.org, Jan Kara , Kuninori Morimoto , linux-fsdevel@vger.kernel.org, Mark Brown , Matthew Bobrowski Subject: Applied "ASoC: rename functions that pollute the simple_xxx namespace" to the asoc tree In-Reply-To: <20190516102641.6574-2-amir73il@gmail.com> X-Patchwork-Hint: ignore Message-Id: <20190521203243.280541126D21@debutante.sirena.org.uk> Date: Tue, 21 May 2019 21:32:43 +0100 (BST) Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The patch ASoC: rename functions that pollute the simple_xxx namespace has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.3 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From b0a821daf0d04e5a8ae99829e24f2fe538f25763 Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Thu, 16 May 2019 13:26:28 +0300 Subject: [PATCH] ASoC: rename functions that pollute the simple_xxx namespace include/linux/fs.h defines a bunch of simple fs helpers, (e.g. simple_rename) and we intend to add an fs helper named simple_remove. Rename the ASoC driver static functions, so they will not collide with the upcoming fs helper function name. Cc: Kuninori Morimoto Cc: Mark Brown Signed-off-by: Amir Goldstein Signed-off-by: Mark Brown --- sound/soc/generic/simple-card.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 9b568f578bcd..d16e894fce2b 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -607,7 +607,7 @@ static int simple_soc_probe(struct snd_soc_card *card) return 0; } -static int simple_probe(struct platform_device *pdev) +static int asoc_simple_probe(struct platform_device *pdev) { struct asoc_simple_priv *priv; struct device *dev = &pdev->dev; @@ -705,7 +705,7 @@ static int simple_probe(struct platform_device *pdev) return ret; } -static int simple_remove(struct platform_device *pdev) +static int asoc_simple_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); @@ -726,8 +726,8 @@ static struct platform_driver asoc_simple_card = { .pm = &snd_soc_pm_ops, .of_match_table = simple_of_match, }, - .probe = simple_probe, - .remove = simple_remove, + .probe = asoc_simple_probe, + .remove = asoc_simple_remove, }; module_platform_driver(asoc_simple_card); -- 2.20.1