[SPARC64]: Kill starfire_cookie from SBUS/PCI.

Totally unused.

We need to traverse the list of global IRQ translaters,
so storing it in the per-bus structures was useless.

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 3 insertions, 9 deletions

diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 5b2261ebda6f..1cb63346f093 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1171,9 +1171,7 @@ static void psycho_iommu_init(struct pci_controller_info *p)
 
         /* If necessary, hook us up for starfire IRQ translations. */
         if (this_is_starfire)
-                p->starfire_cookie = starfire_hookup(p->pbm_A.portid);
-        else
-                p->starfire_cookie = NULL;
+                starfire_hookup(p->pbm_A.portid);
 }
 
 #define PSYCHO_IRQ_RETRY        0x1a00UL
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index ac05e0f692ef..945222e66980 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1221,9 +1221,7 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)
 
         /* Now some Xfire specific grot... */
         if (this_is_starfire)
-                sbus->starfire_cookie = starfire_hookup(sbus->portid);
-        else
-                sbus->starfire_cookie = NULL;
+                starfire_hookup(sbus->portid);
 
         sysio_register_error_handlers(sbus);
 }
diff --git a/arch/sparc64/kernel/starfire.c b/arch/sparc64/kernel/starfire.c
index ae859d40771e..b930fee7708a 100644
--- a/arch/sparc64/kernel/starfire.c
+++ b/arch/sparc64/kernel/starfire.c
@@ -54,7 +54,7 @@ struct starfire_irqinfo {
 static struct starfire_irqinfo *sflist = NULL;
 
 /* Beam me up Scott(McNeil)y... */
-void *starfire_hookup(int upaid)
+void starfire_hookup(int upaid)
 {
         struct starfire_irqinfo *p;
         unsigned long treg_base, hwmid, i;
@@ -81,8 +81,6 @@ void *starfire_hookup(int upaid)
         p->upaid = upaid;
         p->next = sflist;
         sflist = p;
-
-        return (void *) p;
 }
 
 unsigned int starfire_translate(unsigned long imap,