From patchwork Wed Jun 8 13:26:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shunqian Zheng X-Patchwork-Id: 9164615 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7A90604DB for ; Wed, 8 Jun 2016 13:27:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 99F9B2810E for ; Wed, 8 Jun 2016 13:27:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8E27228305; Wed, 8 Jun 2016 13:27:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1481E2810E for ; Wed, 8 Jun 2016 13:27:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAdW5-0003MP-Lv; Wed, 08 Jun 2016 13:27:29 +0000 Received: from mail-pf0-f194.google.com ([209.85.192.194]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1bAdVm-00032Z-KU; Wed, 08 Jun 2016 13:27:11 +0000 Received: by mail-pf0-f194.google.com with SMTP id t190so637148pfb.2; Wed, 08 Jun 2016 06:26:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8jaRwa8SO6vyR3uvmwqsrUU+jWepVR8j9vTkYMGBIyQ=; b=YdaYB5jxRmSaqtCnKAtNJD0MNqYoX1BfHruqfID/kiYXc45zuTXwuQrufV5NQQiPZG BMGYQqqgpUga+nCsFQIV6o2t5XY1fFRvy5ui1bAh5nhnSvMwaLi/aU234xSGi8DRU7TR BoeDIBuprqg/K1NU11yHZHYWBhiTCaBKPO1cl/n/Ni/yvbSMagEC+IyftrCZdx1VsWhb zOST4Sv+q3YGi4X6R6/DFaWe6cO1JUAXmkA0d6DG9th3JhglLnIBlR+E+An6M5V6mBT/ eplO24OuSkF+GA5/Btffve6AiGljFcyVyWSphOGArUHYIB/lGKKqCovaqzOBOvX0X8xV Arig== X-Gm-Message-State: ALyK8tILT1a1QOncbdPz2kbPqiuqEUB5GD7bXc/MPPsYRO5X4nf/vEb1xv1tUmRDTT3Ceg== X-Received: by 10.98.14.14 with SMTP id w14mr5751565pfi.7.1465392413369; Wed, 08 Jun 2016 06:26:53 -0700 (PDT) Received: from SHUNQIAN-W530.example.org ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id tn7sm2604010pac.29.2016.06.08.06.26.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 06:26:52 -0700 (PDT) From: Shunqian Zheng To: joro@8bytes.org, heiko@sntech.de, robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, mark.yao@rock-chips.com, airlied@linux.ie, tfiga@google.com, xxm@rock-chips.com Subject: [PATCH v2 1/7] iommu/rockchip: fix devm_{request, free}_irq parameter Date: Wed, 8 Jun 2016 21:26:26 +0800 Message-Id: <1465392392-2003-2-git-send-email-zhengsq@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465392392-2003-1-git-send-email-zhengsq@rock-chips.com> References: <1465392392-2003-1-git-send-email-zhengsq@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160608_062710_704166_6E65E8CE X-CRM114-Status: GOOD ( 10.06 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Shunqian Zheng , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Simon Xue Even though the iommu shares irq with its master, using the *dev of iommu instead of master's *dev for devm_{request,free}_irq makes things clear. Signed-off-by: Simon Xue Signed-off-by: Shunqian Zheng Reviewed-by: Tomasz Figa --- drivers/iommu/rockchip-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index c7d6156..ec0ce62 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -807,7 +807,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, iommu->domain = domain; - ret = devm_request_irq(dev, iommu->irq, rk_iommu_irq, + ret = devm_request_irq(iommu->dev, iommu->irq, rk_iommu_irq, IRQF_SHARED, dev_name(dev), iommu); if (ret) return ret; @@ -860,7 +860,7 @@ static void rk_iommu_detach_device(struct iommu_domain *domain, } rk_iommu_disable_stall(iommu); - devm_free_irq(dev, iommu->irq, iommu); + devm_free_irq(iommu->dev, iommu->irq, iommu); iommu->domain = NULL;