From patchwork Tue Nov 13 18:30:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 150997 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4740561ljp; Tue, 13 Nov 2018 10:30:30 -0800 (PST) X-Google-Smtp-Source: AJdET5dLO/XHy4g3fuq6k/yBI+jUIg4A1yunNAcn70brMIDK8Jlen3jf3q8sJ0dT5hKtlD1sxlBW X-Received: by 2002:adf:9b02:: with SMTP id b2-v6mr5895598wrc.117.1542133830682; Tue, 13 Nov 2018 10:30:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542133830; cv=none; d=google.com; s=arc-20160816; b=LWA6vDwzNZe2v98cBWmbOCLXNux8gmxgmZX+hXAsD7+nsIvppr/FFnBuXIBoYAname 1Quyd/H95963ZLw21/o+YXrVlC/o40swOoiWcejbpXgLz4Fu3uPreKolJrijQyFOMky0 fRAg6N4xn2OVW4WoWyBzO6iiBmGq8twxBEp0y9df7AE1DoR10M4XK8MVH6wLlJcvwMNS GLa1VSfCN/5Q5jjMVj8Cv4uFViGgsYTmJirtA9v/x/Mw93fL7bpyCvWxlSSfFpIL/KXX NxjqN4a+e6f8VeRiubriq9vp4gCiiI9xiyGqhe6zr2HwFfv+/QtXvTu28+eIp4ZzyYBt OrWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=rstMptxdXsDVChsD/2CBEFY+M+cGExlZZpW/75g+gtQ=; b=aa4QO28EnsJ6gyMXLdPPzgYvxICkoF1KbHcvTwfwxqNMqXWIyBzmUX92qb72Mj/TfU OP6JbWno8Gx5mvol38X4FIw1ipYz/om09asFtHyCzBGlcU0DZs2Xf3xl9g/Nltjr2Z2q ZXCpqliJto8VJnPOnsJ/VLxIdApj8i7lk27f1TxfjLQwD4kukaqUzfzn0FoEal8Vg1c3 rYxBADSQdazCqXffK7YemxdqUkBjQr1OXXKk84ai/V7dMYTz3rVYe1S8FhAtqieVCfCY LRTqH9Bs779Kp9VQkQMmYo4sGtHXo3MFsT1Y0I9Q0yC9Fgnmeq3FGBt44cy+XfI2uT/7 mxhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=vqmBCIL+; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id v184-v6si10937151wma.79.2018.11.13.10.30.30; Tue, 13 Nov 2018 10:30:30 -0800 (PST) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=vqmBCIL+; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id E2F3F26786A; Tue, 13 Nov 2018 19:30:28 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id BA4BE267AB1; Tue, 13 Nov 2018 19:30:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 5B6782677E4 for ; Tue, 13 Nov 2018 19:30:24 +0100 (CET) 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=yCHIGK6bfOQqVSEFA8UK44DRUBPPNusgrZJET34oeI8=; b=vqmBCIL+gEy+ C8kBjw7TR5wQo+npeI29Vf2Q8OifAgDVZBXJ7K83eNpYIEyxfbiHO5lJF4dllPveHdaMFHMQOWpvn jETdxLR++LkU+eALzg6WEyGOYCYlgd/otZIqtTncm+9EjBBSorETXbuNCZXcyuEf3ybsT3YmqUWVJ hLcmA=; Received: from [64.114.255.97] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gMdSB-0002OP-Mv; Tue, 13 Nov 2018 18:30:23 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id B26C4440078; Tue, 13 Nov 2018 18:30:17 +0000 (GMT) From: Mark Brown To: Peter Ujfalusi In-Reply-To: Message-Id: <20181113183017.B26C4440078@finisterre.ee.mobilebroadband> Date: Tue, 13 Nov 2018 18:30:17 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Jarkko Nikula Subject: [alsa-devel] Applied "ASoC: omap-mcbsp: Remove redundant check for mcbsp->pdata" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: omap-mcbsp: Remove redundant check for mcbsp->pdata has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 465d85b3976a15c9e0e205ff50be64efa11b7af3 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 8 Nov 2018 09:29:59 +0200 Subject: [PATCH] ASoC: omap-mcbsp: Remove redundant check for mcbsp->pdata The driver will not probe if the pdata is not provided or created. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Tested-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/omap/omap-mcbsp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.19.1 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index e48fad11a0cc..8cab1151d3bb 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -324,7 +324,7 @@ static int omap_mcbsp_request(struct omap_mcbsp *mcbsp) mcbsp->reg_cache = reg_cache; spin_unlock(&mcbsp->lock); - if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->request) + if(mcbsp->pdata->ops && mcbsp->pdata->ops->request) mcbsp->pdata->ops->request(mcbsp->id - 1); /* @@ -361,7 +361,7 @@ static int omap_mcbsp_request(struct omap_mcbsp *mcbsp) err_free_irq: free_irq(mcbsp->tx_irq, (void *)mcbsp); err_clk_disable: - if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) + if(mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id - 1); /* Disable wakeup behavior */ @@ -382,7 +382,7 @@ static void omap_mcbsp_free(struct omap_mcbsp *mcbsp) { void *reg_cache; - if (mcbsp->pdata && mcbsp->pdata->ops && mcbsp->pdata->ops->free) + if(mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id - 1); /* Disable wakeup behavior */