[PATCH 2/2] powerpc/powernv: Remove duplicate check in tce_iommu_bus_notifier()
Benjamin Herrenschmidt
benh at kernel.crashing.org
Mon Aug 11 13:11:58 EST 2014
On Wed, 2014-08-06 at 17:10 +1000, Gavin Shan wrote:
> The called function iommu_del_device() checks if the device has
> attached IOMMU group, we needn't check it again in the parent
> function call tce_iommu_bus_notifier().
The patch does more than that... it also refactors the function, which
it should either not do or document.
> Signed-off-by: Gavin Shan <gwshan at linux.vnet.ibm.com>
> ---
> arch/powerpc/platforms/powernv/pci.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c
> index f91a4e5..b562b0d 100644
> --- a/arch/powerpc/platforms/powernv/pci.c
> +++ b/arch/powerpc/platforms/powernv/pci.c
> @@ -820,17 +820,18 @@ static int tce_iommu_bus_notifier(struct notifier_block *nb,
> unsigned long action, void *data)
> {
> struct device *dev = data;
> + int ret = 0;
>
> switch (action) {
> case BUS_NOTIFY_ADD_DEVICE:
> - return iommu_add_device(dev);
> + ret = iommu_add_device(dev);
> + break;
> case BUS_NOTIFY_DEL_DEVICE:
> - if (dev->iommu_group)
> - iommu_del_device(dev);
> - return 0;
> - default:
> - return 0;
> + iommu_del_device(dev);
> + break;
> }
> +
> + return ret;
> }
>
> static struct notifier_block tce_iommu_bus_nb = {
More information about the Linuxppc-dev
mailing list