Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc21a66d authored by Geoff Levand's avatar Geoff Levand Committed by Paul Mackerras
Browse files

[POWERPC] cell: remove unused struct spu variable 



Remove the mostly unused variable isrc from struct spu and a forgotten
function declaration.

Signed-off-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 24f43b33

arch/powerpc/platforms/cell/spu_base.c

+3 −18
Original line number Original line Diff line number Diff line
@@ -364,8 +364,7 @@ struct spu *spu_alloc_node(int node) 
	if (!list_empty(&spu_list[node])) {

	if (!list_empty(&spu_list[node])) {

		spu = list_entry(spu_list[node].next, struct spu, list);

		spu = list_entry(spu_list[node].next, struct spu, list);

		list_del_init(&spu->list);

		list_del_init(&spu->list);

		pr_debug("Got SPU %x %d %d\n",

		pr_debug("Got SPU %d %d\n", spu->number, spu->node);

			 spu->isrc, spu->number, spu->node);

		spu_init_channels(spu);

		spu_init_channels(spu);

	}

	}

	mutex_unlock(&spu_mutex);

	mutex_unlock(&spu_mutex);
@@ -591,7 +590,6 @@ static int __init spu_map_interrupts_old(struct spu *spu, struct device_node *np 




	/* Add the node number */

	/* Add the node number */

	isrc |= spu->node << IIC_IRQ_NODE_SHIFT;

	isrc |= spu->node << IIC_IRQ_NODE_SHIFT;

	spu->isrc = isrc;





	/* Now map interrupts of all 3 classes */

	/* Now map interrupts of all 3 classes */

	spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);

	spu->irqs[0] = irq_create_mapping(NULL, IIC_IRQ_CLASS_0 | isrc);
@@ -733,16 +731,6 @@ struct sysdev_class spu_sysdev_class = { 
	set_kset_name("spu")

	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)

static int spu_create_sysdev(struct spu *spu)

{

{

	int ret;

	int ret;
@@ -756,8 +744,6 @@ static int spu_create_sysdev(struct spu *spu) 
		return ret;

		return ret;

	}

	}





	if (spu->isrc != 0)

		sysdev_create_file(&spu->sysdev, &attr_isrc);

	sysfs_add_device_to_node(&spu->sysdev, spu->nid);

	sysfs_add_device_to_node(&spu->sysdev, spu->nid);





	return 0;

	return 0;
@@ -765,7 +751,6 @@ static int spu_create_sysdev(struct spu *spu) 




static void spu_destroy_sysdev(struct spu *spu)

static void spu_destroy_sysdev(struct spu *spu)

{

{

	sysdev_remove_file(&spu->sysdev, &attr_isrc);

	sysfs_remove_device_from_node(&spu->sysdev, spu->nid);

	sysfs_remove_device_from_node(&spu->sysdev, spu->nid);

	sysdev_unregister(&spu->sysdev);

	sysdev_unregister(&spu->sysdev);

}

}
@@ -821,8 +806,8 @@ static int __init create_spu(struct device_node *spe) 
	list_add(&spu->list, &spu_list[spu->node]);

	list_add(&spu->list, &spu_list[spu->node]);

	mutex_unlock(&spu_mutex);

	mutex_unlock(&spu_mutex);





	pr_debug(KERN_DEBUG "Using SPE %s %02x %p %p %p %p %d\n",

	pr_debug(KERN_DEBUG "Using SPE %s %p %p %p %p %d\n",

		spu->name, spu->isrc, spu->local_store,

		spu->name, spu->local_store,

		spu->problem, spu->priv1, spu->priv2, spu->number);

		spu->problem, spu->priv1, spu->priv2, spu->number);

	goto out;

	goto out;

include/asm-powerpc/spu.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -118,7 +118,6 @@ struct spu { 
	int number;

	int number;

	int nid;

	int nid;

	unsigned int irqs[3];

	unsigned int irqs[3];

	u32 isrc;

	u32 node;

	u32 node;

	u64 flags;

	u64 flags;

	u64 dar;

	u64 dar;