From patchwork Thu Oct 15 08:30:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 54990 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id E37712301F for ; Thu, 15 Oct 2015 08:42:25 +0000 (UTC) Received: by lbbms9 with SMTP id ms9sf6729847lbb.3 for ; Thu, 15 Oct 2015 01:42:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=vQmKq5vxGaF4zE7OOqa2AR8zVql0pOPI+I460HMd3mA=; b=ZMqqqMdanXoCktsxT5e5pgH4sVwQflm46hzAkSVqcv5G8826ERoXlTpk7myuHeKEGZ Z1/2U3xf/1Qo1lMsQC7kcYKfMKLpW2H+y3yTXaJOQQOUhyoo+L1+zJpsQzW5Q/ZOYoWw jLuxNA3dFstqh/93B2txaUElR9vlaU1qlAnGqQeNT3b57P6Dol8XXxBS0/RCa6K6I0kV A9f2SOw8c0KAS5EYcET6FWPJsuCk8KYwkoRRyP4wriDl/XVLVbx+ISTJmnc+UEmtJQBb ZULkmkmGyONd4Wcl26HmHJF+Z90I5i+Pz7oM/pDzMFI08sRNvn7q5NiSjnaZST+7urMa bWAQ== X-Gm-Message-State: ALoCoQkaCJCpcjeDoz+/NOlRFWMeX7BDcRxu7h1qTbBqtXihZeYJ1hUbOu85mekj1nHuhjLsl6RW X-Received: by 10.112.54.197 with SMTP id l5mr1820884lbp.21.1444898544928; Thu, 15 Oct 2015 01:42:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.142.3 with SMTP id q3ls118832lfd.64.gmail; Thu, 15 Oct 2015 01:42:24 -0700 (PDT) X-Received: by 10.25.17.78 with SMTP id g75mr2577346lfi.12.1444898544762; Thu, 15 Oct 2015 01:42:24 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id uc9si8391871lbb.103.2015.10.15.01.42.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2015 01:42:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbwr8 with SMTP id r8so63524696lbw.2 for ; Thu, 15 Oct 2015 01:42:24 -0700 (PDT) X-Received: by 10.112.129.202 with SMTP id ny10mr3735207lbb.112.1444898544660; Thu, 15 Oct 2015 01:42:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp481588lbq; Thu, 15 Oct 2015 01:42:23 -0700 (PDT) X-Received: by 10.107.27.8 with SMTP id b8mr10069040iob.114.1444898543608; Thu, 15 Oct 2015 01:42:23 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t94si133265ioe.59.2015.10.15.01.42.23; Thu, 15 Oct 2015 01:42:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752390AbbJOImT (ORCPT + 30 others); Thu, 15 Oct 2015 04:42:19 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:36443 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbbJOIlt (ORCPT ); Thu, 15 Oct 2015 04:41:49 -0400 Received: from 172.24.1.50 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CUG14539; Thu, 15 Oct 2015 16:36:24 +0800 (CST) Received: from localhost (10.177.23.164) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Thu, 15 Oct 2015 16:36:15 +0800 From: Zhen Lei To: Catalin Marinas , Will Deacon , Joerg Roedel , linux-arm-kernel , iommu , Robin Murphy , Laurent Pinchart , linux-kernel CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo , Zhen Lei Subject: [PATCH v4 2/5] iommu/arm-smmu: rename __arm_smmu_get_pci_sid Date: Thu, 15 Oct 2015 16:30:44 +0800 Message-ID: <1444897847-18040-3-git-send-email-thunder.leizhen@huawei.com> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1444897847-18040-1-git-send-email-thunder.leizhen@huawei.com> References: <1444897847-18040-1-git-send-email-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: thunder.leizhen@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Remove the word "pci", to make this function can also be used by non-pci devices. Signed-off-by: Zhen Lei --- drivers/iommu/arm-smmu-v3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 3a54af1..b577d61 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -1738,7 +1738,7 @@ static int __arm_smmu_get_pci_sid(struct pci_dev *pdev, u16 alias, void *sidp) return 0; /* Continue walking */ } -static void __arm_smmu_release_pci_iommudata(void *data) +static void __arm_smmu_release_iommudata(void *data) { kfree(data); } @@ -1793,7 +1793,7 @@ static int __arm_smmu_add_device(struct device *dev, u32 sid) smmu_group->ste.valid = true; smmu_group->smmu = smmu; iommu_group_set_iommudata(group, smmu_group, - __arm_smmu_release_pci_iommudata); + __arm_smmu_release_iommudata); } else { smmu = smmu_group->smmu; }