From: David Herrmann <dh.herrmann@gmail.com>
Date: Thu, 11 Jul 2013 09:56:33 +0000 (+0200)
Subject: drm/pci: remove useles #if 1
X-Git-Tag: firefly_0821_release~176^2~5263^2~166
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c3911624f9ecff440340ad6d94dc5835f55b0db6;p=firefly-linux-kernel-4.4.55.git

drm/pci: remove useles #if 1

These don't make any sense, really..

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@gmail.com>
---

diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 80c0b2b29801..a7b46ff80b0f 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -52,10 +52,8 @@
 drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
 {
 	drm_dma_handle_t *dmah;
-#if 1
 	unsigned long addr;
 	size_t sz;
-#endif
 
 	/* pci_alloc_consistent only guarantees alignment to the smallest
 	 * PAGE_SIZE order which is greater than or equal to the requested size.
@@ -97,10 +95,8 @@ EXPORT_SYMBOL(drm_pci_alloc);
  */
 void __drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
 {
-#if 1
 	unsigned long addr;
 	size_t sz;
-#endif
 
 	if (dmah->vaddr) {
 		/* XXX - Is virt_to_page() legal for consistent mem? */