From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751871AbcCYMlU (ORCPT ); Fri, 25 Mar 2016 08:41:20 -0400 Received: from m50-110.126.com ([123.125.50.110]:46290 "EHLO m50-110.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751989AbcCYMlJ (ORCPT ); Fri, 25 Mar 2016 08:41:09 -0400 X-Greylist: delayed 2006 seconds by postgrey-1.27 at vger.kernel.org; Fri, 25 Mar 2016 08:41:08 EDT From: cn_wyl2003@126.com To: joro@8bytes.org, will.deacon@arm.com, alex.williamson@redhat.com, renesas@opensource.se, yalin.wang2010@gmail.com, nicolas.iooss_linux@m4x.org, robin.murphy@arm.com, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] iommu: change generic_device_group function Date: Fri, 25 Mar 2016 20:06:51 +0800 Message-Id: <1458907611-19694-1-git-send-email-cn_wyl2003@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: jdKowACXn2veKfVWPBzIAg--.5745S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw45WF48ZF18WF1rGr4kWFg_yoW8CrWDpF sxCF90kFWrGr4rCFZxJ340va4rtFs3uayUA3yIgayv9r17tr9YgF9rXFyjkw18XFZ7CF43 Ka4YyrWF9r17Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07joksDUUUUU= X-Originating-IP: [17.87.20.148] X-CM-SenderInfo: 5fqb45rosqija6rslhhfrp/1tbijgI3Qlagy7MwhgAAsB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: yalin wang change this function to return only iommu_group* pointer or PTR_ERR(), never return NULL when failed. The caller of this function only check IS_ERR() for its return value. Signed-off-by: yalin wang --- drivers/iommu/iommu.c | 15 --------------- include/linux/iommu.h | 10 ++++++++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index bfd4f7c..4984108 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -728,21 +728,6 @@ static int get_pci_alias_or_group(struct pci_dev *pdev, u16 alias, void *opaque) } /* - * Generic device_group call-back function. It just allocates one - * iommu-group per device. - */ -struct iommu_group *generic_device_group(struct device *dev) -{ - struct iommu_group *group; - - group = iommu_group_alloc(); - if (IS_ERR(group)) - return NULL; - - return group; -} - -/* * Use standard PCI bus topology, isolation features, and DMA alias quirks * to find or create an IOMMU group for a device. */ diff --git a/include/linux/iommu.h b/include/linux/iommu.h index a5c539f..462280b 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -327,8 +327,14 @@ static inline size_t iommu_map_sg(struct iommu_domain *domain, /* PCI device grouping function */ extern struct iommu_group *pci_device_group(struct device *dev); -/* Generic device grouping function */ -extern struct iommu_group *generic_device_group(struct device *dev); +/* + * Generic device_group call-back function. It just allocates one + * iommu-group per device. + */ +static inline struct iommu_group *generic_device_group(struct device *dev) +{ + return iommu_group_alloc(); +} #else /* CONFIG_IOMMU_API */ -- 1.9.1