Skip to content

Commit

Permalink
[POWERPC] cell: remove unused struct spu variable
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geoff Levand authored and Paul Mackerras committed Oct 25, 2006
1 parent 24f43b3 commit cc21a66
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
21 changes: 3 additions & 18 deletions arch/powerpc/platforms/cell/spu_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,7 @@ struct spu *spu_alloc_node(int node)
if (!list_empty(&spu_list[node])) {
spu = list_entry(spu_list[node].next, struct spu, list);
list_del_init(&spu->list);
pr_debug("Got SPU %x %d %d\n",
spu->isrc, spu->number, spu->node);
pr_debug("Got SPU %d %d\n", spu->number, spu->node);
spu_init_channels(spu);
}
mutex_unlock(&spu_mutex);
Expand Down Expand Up @@ -591,7 +590,6 @@ static int __init spu_map_interrupts_old(struct spu *spu, struct device_node *np

/* Add the node number */
isrc |= spu->node << IIC_IRQ_NODE_SHIFT;
spu->isrc = isrc;

/* Now map interrupts of all 3 classes */
spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
Expand Down Expand Up @@ -733,16 +731,6 @@ struct sysdev_class spu_sysdev_class = {
set_kset_name("spu")
};

static ssize_t spu_show_isrc(struct sys_device *sysdev, char *buf)
{
struct spu *spu = container_of(sysdev, struct spu, sysdev);
return sprintf(buf, "%d\n", spu->isrc);

}
static SYSDEV_ATTR(isrc, 0400, spu_show_isrc, NULL);

extern int attach_sysdev_to_node(struct sys_device *dev, int nid);

static int spu_create_sysdev(struct spu *spu)
{
int ret;
Expand All @@ -756,16 +744,13 @@ static int spu_create_sysdev(struct spu *spu)
return ret;
}

if (spu->isrc != 0)
sysdev_create_file(&spu->sysdev, &attr_isrc);
sysfs_add_device_to_node(&spu->sysdev, spu->nid);

return 0;
}

static void spu_destroy_sysdev(struct spu *spu)
{
sysdev_remove_file(&spu->sysdev, &attr_isrc);
sysfs_remove_device_from_node(&spu->sysdev, spu->nid);
sysdev_unregister(&spu->sysdev);
}
Expand Down Expand Up @@ -821,8 +806,8 @@ static int __init create_spu(struct device_node *spe)
list_add(&spu->list, &spu_list[spu->node]);
mutex_unlock(&spu_mutex);

pr_debug(KERN_DEBUG "Using SPE %s %02x %p %p %p %p %d\n",
spu->name, spu->isrc, spu->local_store,
pr_debug(KERN_DEBUG "Using SPE %s %p %p %p %p %d\n",
spu->name, spu->local_store,
spu->problem, spu->priv1, spu->priv2, spu->number);
goto out;

Expand Down
1 change: 0 additions & 1 deletion include/asm-powerpc/spu.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ struct spu {
int number;
int nid;
unsigned int irqs[3];
u32 isrc;
u32 node;
u64 flags;
u64 dar;
Expand Down

0 comments on commit cc21a66

Please sign in to comment.