From patchwork Tue Mar 31 05:00:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 456507 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 75EA514019D for ; Tue, 31 Mar 2015 16:35:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=cdGuzd1E; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 316B41A2AA9 for ; Tue, 31 Mar 2015 16:35:01 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=cdGuzd1E; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pa0-x22b.google.com (mail-pa0-x22b.google.com [IPv6:2607:f8b0:400e:c03::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id D86A31A0A0B for ; Tue, 31 Mar 2015 16:02:15 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=cdGuzd1E; dkim-adsp=pass; dkim-atps=neutral Received: by padcy3 with SMTP id cy3so8043263pad.3 for ; Mon, 30 Mar 2015 22:02:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m51LyArzGxdyPxmeChm8HHppuVRAGqTRA8+3dAPE4I0=; b=cdGuzd1E5ZZLiT11VpGcZOR1zzYgiNWZIsrpQvczLs+3EAIuIjphj7Tc7H/+X6WJiW zvFYLU3cMuDx1FQAQ2EUkNneYBgs2PfMst37W9Q/RNIbOHcVkAJx3enNBIf8Sx5JKWKe trSj1NoDb4F1foVW+3xg1rdc3vVq3f08xUVbA= 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=m51LyArzGxdyPxmeChm8HHppuVRAGqTRA8+3dAPE4I0=; b=COPG0tT3+bLUj6gM1VQSqQBm4FpwvEZbD0n7AHGVWjQKFCHwfUlqPmkba4vm2mcack JMwG8KJ8KxDF7JwsinWxrpnGoF70Tk/WSXo+nDRgzTTUgdIislZzDZO3l2B3akDaTnWn rTKOYP95fhEdoeZz+sTtTGdd0y5IfuWHyj9NDJL8786dg33Zn47p+TENRQd2o/xcEdRy 6998G91KjBmwdDDSSvkTuiAN6PmVnKxBVR70nXVxj0/fstU1z8rQmQn5UTsK8vvP8wN/ dhTCE9rUKCBO8ajLr3qzRgfx+UArDgDoklnMISlsUGgcpWDgD4DphZ4kNeKpzaFvhIxo Zb4w== X-Gm-Message-State: ALoCoQl2eODQWzznM8Y0QH8hmPWsGUS0z5c5HHyc4W02+raTBb6Y8y4oP+aopPB6jOjjuPEvEvu7 X-Received: by 10.68.223.226 with SMTP id qx2mr65189476pbc.71.1427778133921; Mon, 30 Mar 2015 22:02:13 -0700 (PDT) Received: from omicron.ozlabs.ibm.com ([122.99.82.10]) by mx.google.com with ESMTPSA id i6sm12385535pdp.53.2015.03.30.22.02.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2015 22:02:13 -0700 (PDT) From: Daniel Axtens To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 19/19] powerpc: dart_iommu: Remove check for controller_ops == NULL case Date: Tue, 31 Mar 2015 16:00:57 +1100 Message-Id: <1427778057-9505-20-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427778057-9505-1-git-send-email-dja@axtens.net> References: <1427778057-9505-1-git-send-email-dja@axtens.net> Cc: Daniel Axtens X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Now that we have ported the calls to iommu_init_early_dart to always supply a pci_controller_ops struct, we can safely drop the check. Signed-off-by: Daniel Axtens --- arch/powerpc/sysdev/dart_iommu.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c index 87b8000..d00a566 100644 --- a/arch/powerpc/sysdev/dart_iommu.c +++ b/arch/powerpc/sysdev/dart_iommu.c @@ -395,20 +395,17 @@ void __init iommu_init_early_dart(struct pci_controller_ops *controller_ops) if (dart_is_u4) ppc_md.dma_set_mask = dart_dma_set_mask; - if (controller_ops) { - controller_ops->dma_dev_setup = pci_dma_dev_setup_dart; - controller_ops->dma_bus_setup = pci_dma_bus_setup_dart; - } + controller_ops->dma_dev_setup = pci_dma_dev_setup_dart; + controller_ops->dma_bus_setup = pci_dma_bus_setup_dart; + /* Setup pci_dma ops */ set_pci_dma_ops(&dma_iommu_ops); return; bail: /* If init failed, use direct iommu and null setup functions */ - if (controller_ops) { - controller_ops->dma_dev_setup = NULL; - controller_ops->dma_bus_setup = NULL; - } + controller_ops->dma_dev_setup = NULL; + controller_ops->dma_bus_setup = NULL; /* Setup pci_dma ops */ set_pci_dma_ops(&dma_direct_ops);