From ac7660b8e672139d2213b95457a822f2d9078630 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Dec 2007 01:50:35 +1100
Subject: [PATCH] --- yaml --- r: 81013 b: refs/heads/master c:
 6a9057933421126ef8265c15b8220c015865b1eb h: refs/heads/master i:   81011:
 c036194118f3bbdd3c9345d4d56f19cbfe1015cd v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/powerpc/platforms/iseries/pci.c | 19 +------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 270d4bd70fcc..ca97a7b7d8c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a73bd7f06dad5c466c5f3a4712696a3932a428b
+refs/heads/master: 6a9057933421126ef8265c15b8220c015865b1eb
diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c
index 705f52c7ce54..cff832a64e1f 100644
--- a/trunk/arch/powerpc/platforms/iseries/pci.c
+++ b/trunk/arch/powerpc/platforms/iseries/pci.c
@@ -210,7 +210,7 @@ void __init iSeries_pci_final_fixup(void)
 			}
 
 			++num_dev;
-			pdev->sysdata = (void *)node;
+			pdev->sysdata = node;
 			PCI_DN(node)->pcidev = pdev;
 			allocate_device_bars(pdev);
 			iSeries_Device_Information(pdev, num_dev);
@@ -223,23 +223,6 @@ void __init iSeries_pci_final_fixup(void)
 	mf_display_src(0xC9000200);
 }
 
-#if 0
-/*
- * Returns the device node for the passed pci_dev
- * Sanity Check Node PciDev to passed pci_dev
- * If none is found, returns a NULL which the client must handle.
- */
-static struct device_node *get_device_node(struct pci_dev *pdev)
-{
-	struct device_node *node;
-
-	node = pdev->sysdata;
-	if (node == NULL || PCI_DN(node)->pcidev != pdev)
-		node = find_device_node(pdev->bus->number, pdev->devfn);
-	return node;
-}
-#endif
-
 /*
  * Config space read and write functions.
  * For now at least, we look for the device node for the bus and devfn