From patchwork Tue Nov 13 18:33:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 151001 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4744309ljp; Tue, 13 Nov 2018 10:33:46 -0800 (PST) X-Google-Smtp-Source: AJdET5cTtJJjO8ejV763azQqx9QN9YlKzdmGCqUh6WyrsCqJHbsQPzz+rEZnZ+HSS3sIhYGDh97h X-Received: by 2002:a5d:6a42:: with SMTP id t2mr359619wrw.50.1542134026114; Tue, 13 Nov 2018 10:33:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542134026; cv=none; d=google.com; s=arc-20160816; b=jymuGRHM1+Z2va1qzN+Aj2gMYdJgW9MZr5F+/8DCNpJWQjjhxAjc90LRaCkygoxUOp Vm1+h5UQreqatGDbe4Ycq4xNYLNrOEVay+Q6XpzKi06KNYvTTj9bODlO3hMv4hiMjGFD tLbWBJ05l+dkWs/OSTfheHlkXE7vXYwbPa4VXxDexFu48bD7Vetj3biHYnPZHH4u87MR u8f0fXnRoHQl3wxmDt8BLnyG2dD0alo0vGRgLb98/pEWPk7Q+EdH+6yJFIoPpXHTmJRQ KXFyVGWmHih/OZGul7d7DqAMvZDzNukpnKZCcaPsX0ZmhWY29pDi5zGdO3CnNl9KNCU9 lHBg== 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=gPm5v03sAshhxrii3FYz6pIz7pitmpoYXBscedeBu/o=; b=Zqnlfiyh3nViZU4v7pWjilY9NGKTp7O39U+LItnoAtFdR+BEkxgArYdgJRvauJAiAo fSGSbxQk9y7vho/qD89qYcT2IfPUzd0+qkdRMECUj+3sryhCAFRRPz29e211wHEHrNdl aIyr60EtHCwX76RllPCtWC7w+jEmLYMdjWX9+QtpPyvzP7LIoo9LY2kljMHGjeMx2xNY 3KBRMKqmwbKU8KmTQb4pQdDXstrKdCgIjqpajiow0hFzRnngnK4ARS0bUeRmbqKrW/0L y9JScAw4U02UOC4F2NfLRzgFiuqaqqSqfkI/Kmq5/TLft1bBop1O07YUjbADT51Mjq+j Oxuw== 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=TYC8CXtq; 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 l2-v6si15036606wra.195.2018.11.13.10.33.45; Tue, 13 Nov 2018 10:33:46 -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=TYC8CXtq; 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 F0527267AD4; Tue, 13 Nov 2018 19:33:39 +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 8F0DB267AB1; Tue, 13 Nov 2018 19:33:36 +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 057D226786A for ; Tue, 13 Nov 2018 19:33:33 +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=EZ8ajngxA5K5H/kFY/0W7dP8Zgj2aAhHiCmRFM7fK3g=; b=TYC8CXtqgnpx bawRCbh9Mmj/rHegSy/YvYCW7kcksZRurB/BG+JP1IL9ouf0fMYVm6FzJFctsPV16lSZng4pbOck2 9ahSX3Hv0OtuZ/0PRhkPL2YZC7OLe5sGOZp2Tfboi/11OlEH8M1t0NBbIGwfwC1A66rEDLYPN51wO jdOAw=; 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 1gMdVF-0002Or-98; Tue, 13 Nov 2018 18:33:33 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id EA84A440079; Tue, 13 Nov 2018 18:33:30 +0000 (GMT) From: Mark Brown To: Peter Ujfalusi In-Reply-To: Message-Id: <20181113183330.EA84A440079@finisterre.ee.mobilebroadband> Date: Tue, 13 Nov 2018 18:33:30 +0000 (GMT) Cc: alsa-devel@alsa-project.org, Mark Brown , Jarkko Nikula Subject: [alsa-devel] Applied "ASoC: omap-mcbsp: Clean up the interrupt handlers" 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: Clean up the interrupt handlers 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 d63a7625a6dff8f75604b952de600d24b58b8b54 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 8 Nov 2018 09:29:55 +0200 Subject: [PATCH] ASoC: omap-mcbsp: Clean up the interrupt handlers The parameter name of dev_id is leftover from the old times when we passed numeric ID as data for the interrupt handlers. The mcbsp_rx and mcbsp_tx is misleading as they are pointers to the mcbsp struct. Signed-off-by: Peter Ujfalusi Acked-by: Jarkko Nikula Tested-by: Jarkko Nikula Signed-off-by: Mark Brown --- sound/soc/omap/mcbsp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 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/mcbsp.c b/sound/soc/omap/mcbsp.c index 8c3cedfcb878..fca0b0e9186b 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c @@ -110,9 +110,9 @@ static void omap_mcbsp_dump_reg(struct omap_mcbsp *mcbsp) dev_dbg(mcbsp->dev, "***********************\n"); } -static irqreturn_t omap_mcbsp_irq_handler(int irq, void *dev_id) +static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data) { - struct omap_mcbsp *mcbsp = dev_id; + struct omap_mcbsp *mcbsp = data; u16 irqst; irqst = MCBSP_READ(mcbsp, IRQST); @@ -151,37 +151,37 @@ static irqreturn_t omap_mcbsp_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *dev_id) +static irqreturn_t omap_mcbsp_tx_irq_handler(int irq, void *data) { - struct omap_mcbsp *mcbsp_tx = dev_id; + struct omap_mcbsp *mcbsp = data; u16 irqst_spcr2; - irqst_spcr2 = MCBSP_READ(mcbsp_tx, SPCR2); - dev_dbg(mcbsp_tx->dev, "TX IRQ callback : 0x%x\n", irqst_spcr2); + irqst_spcr2 = MCBSP_READ(mcbsp, SPCR2); + dev_dbg(mcbsp->dev, "TX IRQ callback : 0x%x\n", irqst_spcr2); if (irqst_spcr2 & XSYNC_ERR) { - dev_err(mcbsp_tx->dev, "TX Frame Sync Error! : 0x%x\n", + dev_err(mcbsp->dev, "TX Frame Sync Error! : 0x%x\n", irqst_spcr2); /* Writing zero to XSYNC_ERR clears the IRQ */ - MCBSP_WRITE(mcbsp_tx, SPCR2, MCBSP_READ_CACHE(mcbsp_tx, SPCR2)); + MCBSP_WRITE(mcbsp, SPCR2, MCBSP_READ_CACHE(mcbsp, SPCR2)); } return IRQ_HANDLED; } -static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *dev_id) +static irqreturn_t omap_mcbsp_rx_irq_handler(int irq, void *data) { - struct omap_mcbsp *mcbsp_rx = dev_id; + struct omap_mcbsp *mcbsp = data; u16 irqst_spcr1; - irqst_spcr1 = MCBSP_READ(mcbsp_rx, SPCR1); - dev_dbg(mcbsp_rx->dev, "RX IRQ callback : 0x%x\n", irqst_spcr1); + irqst_spcr1 = MCBSP_READ(mcbsp, SPCR1); + dev_dbg(mcbsp->dev, "RX IRQ callback : 0x%x\n", irqst_spcr1); if (irqst_spcr1 & RSYNC_ERR) { - dev_err(mcbsp_rx->dev, "RX Frame Sync Error! : 0x%x\n", + dev_err(mcbsp->dev, "RX Frame Sync Error! : 0x%x\n", irqst_spcr1); /* Writing zero to RSYNC_ERR clears the IRQ */ - MCBSP_WRITE(mcbsp_rx, SPCR1, MCBSP_READ_CACHE(mcbsp_rx, SPCR1)); + MCBSP_WRITE(mcbsp, SPCR1, MCBSP_READ_CACHE(mcbsp, SPCR1)); } return IRQ_HANDLED;