From patchwork Thu Sep 13 11:39:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146625 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp496980ljw; Thu, 13 Sep 2018 04:39:30 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbJsC3kw2cdnCwjO4xjK5IzHgSIi77dD4LHHImeeuRriOivbhjvXOAUmgkFmVTF5vm31sLZ X-Received: by 2002:a5d:6243:: with SMTP id m3-v6mr5349588wrv.179.1536838770364; Thu, 13 Sep 2018 04:39:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536838770; cv=none; d=google.com; s=arc-20160816; b=qm5LkKe8INkdqv59fWorRSdSuFTmmglrW+CwI7+ftaldJwNlCHm59ni1QN7Z9fNI41 3uPt8Nix1cb2omwPDTdAKqkxq49Z7JcZvUstEn8M+cH/+zAfPicQV0aWcQ3UU4stUDZ2 fpZ7xgl9ZwoJHkQXZBZ8d4vs38V39rWp7GFxYinXG5mSYXcHtZ+iXuyzGpoSF35mPdSk YCit3gcavC4U73fpokgvPrqCV29pf/79GWclYfFEr9HiZyYgZ4InX0S9Nge+EPNVh2KY SK/B8yctlcVcdU8BsiN5HBFRihEY75/hgGTolXebdGMzYvRvwW4r7pdlDxxy36QpJs68 uMsQ== 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=GWEZ+nFWd5Zx7HNc0w2nXY/ePQJ02j87igK/V6MTdDU=; b=MoIESqhe41JLX5dHU2b4EWk2u/3LJc9rnzjJLS9ys83QxI7VB0aJBj0LrmdfDVuw50 ZL3BbA5CB6u7cL8I0MWeQix323qj7JX/fS6eM3uT9iYax0jOFz4V1EmIM8wbQx8fwYrj sT5TeOBurBp64gPoLRwZOedoEkFkY8pmXSv10/PQjfE7QFWs0Cq8NO4utNI/Gw/+ojry rIN0hr2NELGZ0mX+xJFZr0K+zChpjSFfeGeWZzljcv1p4LcKjq3RjAN/CeZHTUMQ2/0b phQIJTaN8pPEDUeE92tpV/EtCT99Kgu14+mLyM5baAcTYtzEZgh2qbGNo1E2AkAids4m KU0A== 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=Vicoo7zr; 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 j8-v6si3402718wrv.9.2018.09.13.04.39.30; Thu, 13 Sep 2018 04:39:30 -0700 (PDT) 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=Vicoo7zr; 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 353CA26788E; Thu, 13 Sep 2018 13:39:29 +0200 (CEST) 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 6CA8326788C; Thu, 13 Sep 2018 13:39:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS 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 D346726788E for ; Thu, 13 Sep 2018 13:39:24 +0200 (CEST) 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=VoZXuuh+w3ZcgqQQJ+ZgTsd1R9HdwdCJWx86SGk/mfc=; b=Vicoo7zruKW1 jjKiHVKmGLAmnZElMc4Q5WDpnhOVIzPUru3MJPBGRTdUEPGXp6GwCUSqaSG47CKEKdXsayZToY1wj iNZanMCOj6FPiVoNa+4rgow+VNX23mfsIcGoSIKA+SouFufEi1tx3M+V0krmQghFJRo1FO+m81zE7 nX81o=; 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 1g0Pxz-0000JJ-FC; Thu, 13 Sep 2018 11:39:23 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 395B41121CA5; Thu, 13 Sep 2018 12:39:23 +0100 (BST) From: Mark Brown To: Kuninori Morimoto In-Reply-To: <87wors4jf0.wl-kuninori.morimoto.gx@renesas.com> Message-Id: <20180913113923.395B41121CA5@debutante.sirena.org.uk> Date: Thu, 13 Sep 2018 12:39:23 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: soc-core: remove dai->driver NULL check" 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: soc-core: remove dai->driver NULL check 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 a7c439d6128de2cbc087ae7524b47f613ff8bc6c Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Tue, 11 Sep 2018 15:50:27 +0900 Subject: [PATCH] ASoC: soc-core: remove dai->driver NULL check It is strange if it has "dai" but doesn't have "dai->driver". And more over "dai->driver->xxx" is used everywhere without "dai->driver" pointer NULL checking. It got Oops already if "dai->driver" was NULL. Let's remove un-needed "dai->driver" NULL check. Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 807f112fad80..325dc1964850 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2519,8 +2519,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_ratio); */ int snd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) { - if (dai->driver == NULL) - return -EINVAL; if (dai->driver->ops->set_fmt == NULL) return -ENOTSUPP; return dai->driver->ops->set_fmt(dai, fmt); @@ -2667,9 +2665,6 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate); int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute, int direction) { - if (!dai->driver) - return -ENOTSUPP; - if (dai->driver->ops->mute_stream) return dai->driver->ops->mute_stream(dai, mute, direction); else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&