lkml.org 
[lkml]   [2020]   [Jan]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 070/110] iommu/dma: fix variable cookie set but not used
    Date
    From: Qian Cai <cai@lca.pw>

    [ Upstream commit 55817b340a31951d23d1692db45522560b1d20f9 ]

    The commit c18647900ec8 ("iommu/dma: Relax locking in
    iommu_dma_prepare_msi()") introduced a compliation warning,

    drivers/iommu/dma-iommu.c: In function 'iommu_dma_prepare_msi':
    drivers/iommu/dma-iommu.c:1206:27: warning: variable 'cookie' set but
    not used [-Wunused-but-set-variable]
    struct iommu_dma_cookie *cookie;
    ^~~~~~

    Fixes: c18647900ec8 ("iommu/dma: Relax locking in iommu_dma_prepare_msi()")
    Signed-off-by: Qian Cai <cai@lca.pw>
    Acked-by: Robin Murphy <robin.murphy@arm.com>
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/dma-iommu.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
    index 51456e7f264f9..c68a1f072c314 100644
    --- a/drivers/iommu/dma-iommu.c
    +++ b/drivers/iommu/dma-iommu.c
    @@ -1177,7 +1177,6 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)
    {
    struct device *dev = msi_desc_to_dev(desc);
    struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
    - struct iommu_dma_cookie *cookie;
    struct iommu_dma_msi_page *msi_page;
    static DEFINE_MUTEX(msi_prepare_lock); /* see below */

    @@ -1186,8 +1185,6 @@ int iommu_dma_prepare_msi(struct msi_desc *desc, phys_addr_t msi_addr)
    return 0;
    }

    - cookie = domain->iova_cookie;
    -
    /*
    * In fact the whole prepare operation should already be serialised by
    * irq_domain_mutex further up the callchain, but that's pretty subtle
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-30 19:52    [W:4.061 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site