Commit 286bbe87 authored by David S. Miller's avatar David S. Miller Committed by David S. Miller

[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: default avatarDavid S. Miller <davem@davemloft.net>
parent bf7e8511
...@@ -1171,9 +1171,7 @@ static void psycho_iommu_init(struct pci_controller_info *p) ...@@ -1171,9 +1171,7 @@ static void psycho_iommu_init(struct pci_controller_info *p)
/* If necessary, hook us up for starfire IRQ translations. */ /* If necessary, hook us up for starfire IRQ translations. */
if (this_is_starfire) if (this_is_starfire)
p->starfire_cookie = starfire_hookup(p->pbm_A.portid); starfire_hookup(p->pbm_A.portid);
else
p->starfire_cookie = NULL;
} }
#define PSYCHO_IRQ_RETRY 0x1a00UL #define PSYCHO_IRQ_RETRY 0x1a00UL
......
...@@ -1221,9 +1221,7 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus) ...@@ -1221,9 +1221,7 @@ static void __init sbus_iommu_init(int __node, struct sbus_bus *sbus)
/* Now some Xfire specific grot... */ /* Now some Xfire specific grot... */
if (this_is_starfire) if (this_is_starfire)
sbus->starfire_cookie = starfire_hookup(sbus->portid); starfire_hookup(sbus->portid);
else
sbus->starfire_cookie = NULL;
sysio_register_error_handlers(sbus); sysio_register_error_handlers(sbus);
} }
......
...@@ -54,7 +54,7 @@ struct starfire_irqinfo { ...@@ -54,7 +54,7 @@ struct starfire_irqinfo {
static struct starfire_irqinfo *sflist = NULL; static struct starfire_irqinfo *sflist = NULL;
/* Beam me up Scott(McNeil)y... */ /* Beam me up Scott(McNeil)y... */
void *starfire_hookup(int upaid) void starfire_hookup(int upaid)
{ {
struct starfire_irqinfo *p; struct starfire_irqinfo *p;
unsigned long treg_base, hwmid, i; unsigned long treg_base, hwmid, i;
...@@ -81,8 +81,6 @@ void *starfire_hookup(int upaid) ...@@ -81,8 +81,6 @@ void *starfire_hookup(int upaid)
p->upaid = upaid; p->upaid = upaid;
p->next = sflist; p->next = sflist;
sflist = p; sflist = p;
return (void *) p;
} }
unsigned int starfire_translate(unsigned long imap, unsigned int starfire_translate(unsigned long imap,
......
...@@ -217,8 +217,6 @@ struct pci_controller_info { ...@@ -217,8 +217,6 @@ struct pci_controller_info {
struct pci_ops *pci_ops; struct pci_ops *pci_ops;
unsigned int pci_first_busno; unsigned int pci_first_busno;
unsigned int pci_last_busno; unsigned int pci_last_busno;
void *starfire_cookie;
}; };
/* PCI devices which are not bridges have this placed in their pci_dev /* PCI devices which are not bridges have this placed in their pci_dev
......
...@@ -80,7 +80,6 @@ struct sbus_bus { ...@@ -80,7 +80,6 @@ struct sbus_bus {
int num_sbus_ranges; int num_sbus_ranges;
int portid; int portid;
void *starfire_cookie;
}; };
#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev) #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)
......
...@@ -14,7 +14,7 @@ extern int this_is_starfire; ...@@ -14,7 +14,7 @@ extern int this_is_starfire;
extern void check_if_starfire(void); extern void check_if_starfire(void);
extern void starfire_cpu_setup(void); extern void starfire_cpu_setup(void);
extern int starfire_hard_smp_processor_id(void); extern int starfire_hard_smp_processor_id(void);
extern void *starfire_hookup(int); extern void starfire_hookup(int);
extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid); extern unsigned int starfire_translate(unsigned long imap, unsigned int upaid);
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment