aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Levand <geoffrey.levand@am.sony.com>2006-10-24 12:31:15 -0400
committerPaul Mackerras <paulus@samba.org>2006-10-25 00:20:21 -0400
commitcc21a66d7f727ab97b27af9cf763bc0b51510ffa (patch)
tree3923ce08c3a641751ed74f89dc2f65b031f84578
parent24f43b33f74c8e8c8aabc40b728eaf9137802942 (diff)
[POWERPC] cell: remove unused struct spu variable
Remove the mostly unused variable isrc from struct spu and a forgotten function declaration. Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/cell/spu_base.c21
-rw-r--r--include/asm-powerpc/spu.h1
2 files changed, 3 insertions, 19 deletions
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index d41ad1d6c04b..f6c94087db40 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -364,8 +364,7 @@ struct spu *spu_alloc_node(int node)
364 if (!list_empty(&spu_list[node])) { 364 if (!list_empty(&spu_list[node])) {
365 spu = list_entry(spu_list[node].next, struct spu, list); 365 spu = list_entry(spu_list[node].next, struct spu, list);
366 list_del_init(&spu->list); 366 list_del_init(&spu->list);
367 pr_debug("Got SPU %x %d %d\n", 367 pr_debug("Got SPU %d %d\n", spu->number, spu->node);
368 spu->isrc, spu->number, spu->node);
369 spu_init_channels(spu); 368 spu_init_channels(spu);
370 } 369 }
371 mutex_unlock(&spu_mutex); 370 mutex_unlock(&spu_mutex);
@@ -591,7 +590,6 @@ static int __init spu_map_interrupts_old(struct spu *spu, struct device_node *np
591 590
592 /* Add the node number */ 591 /* Add the node number */
593 isrc |= spu->node << IIC_IRQ_NODE_SHIFT; 592 isrc |= spu->node << IIC_IRQ_NODE_SHIFT;
594 spu->isrc = isrc;
595 593
596 /* Now map interrupts of all 3 classes */ 594 /* Now map interrupts of all 3 classes */
597 spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc); 595 spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
@@ -733,16 +731,6 @@ struct sysdev_class spu_sysdev_class = {
733 set_kset_name("spu") 731 set_kset_name("spu")
734}; 732};
735 733
736static ssize_t spu_show_isrc(struct sys_device *sysdev, char *buf)
737{
738 struct spu *spu = container_of(sysdev, struct spu, sysdev);
739 return sprintf(buf, "%d\n", spu->isrc);
740
741}
742static SYSDEV_ATTR(isrc, 0400, spu_show_isrc, NULL);
743
744extern int attach_sysdev_to_node(struct sys_device *dev, int nid);
745
746static int spu_create_sysdev(struct spu *spu) 734static int spu_create_sysdev(struct spu *spu)
747{ 735{
748 int ret; 736 int ret;
@@ -756,8 +744,6 @@ static int spu_create_sysdev(struct spu *spu)
756 return ret; 744 return ret;
757 } 745 }
758 746
759 if (spu->isrc != 0)
760 sysdev_create_file(&spu->sysdev, &attr_isrc);
761 sysfs_add_device_to_node(&spu->sysdev, spu->nid); 747 sysfs_add_device_to_node(&spu->sysdev, spu->nid);
762 748
763 return 0; 749 return 0;
@@ -765,7 +751,6 @@ static int spu_create_sysdev(struct spu *spu)
765 751
766static void spu_destroy_sysdev(struct spu *spu) 752static void spu_destroy_sysdev(struct spu *spu)
767{ 753{
768 sysdev_remove_file(&spu->sysdev, &attr_isrc);
769 sysfs_remove_device_from_node(&spu->sysdev, spu->nid); 754 sysfs_remove_device_from_node(&spu->sysdev, spu->nid);
770 sysdev_unregister(&spu->sysdev); 755 sysdev_unregister(&spu->sysdev);
771} 756}
@@ -821,8 +806,8 @@ static int __init create_spu(struct device_node *spe)
821 list_add(&spu->list, &spu_list[spu->node]); 806 list_add(&spu->list, &spu_list[spu->node]);
822 mutex_unlock(&spu_mutex); 807 mutex_unlock(&spu_mutex);
823 808
824 pr_debug(KERN_DEBUG "Using SPE %s %02x %p %p %p %p %d\n", 809 pr_debug(KERN_DEBUG "Using SPE %s %p %p %p %p %d\n",
825 spu->name, spu->isrc, spu->local_store, 810 spu->name, spu->local_store,
826 spu->problem, spu->priv1, spu->priv2, spu->number); 811 spu->problem, spu->priv1, spu->priv2, spu->number);
827 goto out; 812 goto out;
828 813
diff --git a/include/asm-powerpc/spu.h b/include/asm-powerpc/spu.h
index e73ea00efd8b..cac4ad90a1d4 100644
--- a/include/asm-powerpc/spu.h
+++ b/include/asm-powerpc/spu.h
@@ -118,7 +118,6 @@ struct spu {
118 int number; 118 int number;
119 int nid; 119 int nid;
120 unsigned int irqs[3]; 120 unsigned int irqs[3];
121 u32 isrc;
122 u32 node; 121 u32 node;
123 u64 flags; 122 u64 flags;
124 u64 dar; 123 u64 dar;