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

Commit 6dfa5ca3 authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c-powermac: Include the i2c_adapter in struct pmac_i2c_bus 



Include the i2c_adapter in struct pmac_i2c_bus. This avoids memory
fragmentation and allows for several code cleanups.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Tested-by: default avatarMichel Daenzer <michel@daenzer.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
parent d7d838a6

arch/powerpc/include/asm/pmac_low_i2c.h

+1 −5
Original line number Diff line number Diff line
@@ -72,11 +72,7 @@ extern int pmac_i2c_get_type(struct pmac_i2c_bus *bus); 
extern int pmac_i2c_get_flags(struct pmac_i2c_bus *bus);

extern int pmac_i2c_get_channel(struct pmac_i2c_bus *bus);



/* i2c layer adapter attach/detach */

extern void pmac_i2c_attach_adapter(struct pmac_i2c_bus *bus,

				    struct i2c_adapter *adapter);

extern void pmac_i2c_detach_adapter(struct pmac_i2c_bus *bus,

				    struct i2c_adapter *adapter);

/* i2c layer adapter helpers */

extern struct i2c_adapter *pmac_i2c_get_adapter(struct pmac_i2c_bus *bus);

extern struct pmac_i2c_bus *pmac_i2c_adapter_to_bus(struct i2c_adapter *adapter);

arch/powerpc/platforms/powermac/low_i2c.c

+5 −20
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/interrupt.h>

#include <linux/timer.h>

#include <linux/mutex.h>

#include <linux/i2c.h>

#include <asm/keylargo.h>

#include <asm/uninorth.h>

#include <asm/io.h>
@@ -80,7 +81,7 @@ struct pmac_i2c_bus 
	struct device_node	*busnode;

	int			type;

	int			flags;

	struct i2c_adapter	*adapter;

	struct i2c_adapter	adapter;

	void			*hostdata;

	int			channel;	/* some hosts have multiple */

	int			mode;		/* current mode */
@@ -1014,25 +1015,9 @@ int pmac_i2c_get_channel(struct pmac_i2c_bus *bus) 
EXPORT_SYMBOL_GPL(pmac_i2c_get_channel);





void pmac_i2c_attach_adapter(struct pmac_i2c_bus *bus,

			     struct i2c_adapter *adapter)

{

	WARN_ON(bus->adapter != NULL);

	bus->adapter = adapter;

}

EXPORT_SYMBOL_GPL(pmac_i2c_attach_adapter);



void pmac_i2c_detach_adapter(struct pmac_i2c_bus *bus,

			     struct i2c_adapter *adapter)

{

	WARN_ON(bus->adapter != adapter);

	bus->adapter = NULL;

}

EXPORT_SYMBOL_GPL(pmac_i2c_detach_adapter);



struct i2c_adapter *pmac_i2c_get_adapter(struct pmac_i2c_bus *bus)

{

	return bus->adapter;

	return &bus->adapter;

}

EXPORT_SYMBOL_GPL(pmac_i2c_get_adapter);
@@ -1041,7 +1026,7 @@ struct pmac_i2c_bus *pmac_i2c_adapter_to_bus(struct i2c_adapter *adapter) 
	struct pmac_i2c_bus *bus;



	list_for_each_entry(bus, &pmac_i2c_busses, link)

		if (bus->adapter == adapter)

		if (&bus->adapter == adapter)

			return bus;

	return NULL;

}
@@ -1053,7 +1038,7 @@ int pmac_i2c_match_adapter(struct device_node *dev, struct i2c_adapter *adapter) 


	if (bus == NULL)

		return 0;

	return (bus->adapter == adapter);

	return (&bus->adapter == adapter);

}

EXPORT_SYMBOL_GPL(pmac_i2c_match_adapter);

drivers/i2c/busses/i2c-powermac.c

+3 −12
Original line number Diff line number Diff line
@@ -204,19 +204,16 @@ static const struct i2c_algorithm i2c_powermac_algorithm = { 
static int __devexit i2c_powermac_remove(struct platform_device *dev)

{

	struct i2c_adapter	*adapter = platform_get_drvdata(dev);

	struct pmac_i2c_bus	*bus = i2c_get_adapdata(adapter);

	int			rc;



	rc = i2c_del_adapter(adapter);

	pmac_i2c_detach_adapter(bus, adapter);

	i2c_set_adapdata(adapter, NULL);

	/* We aren't that prepared to deal with this... */

	if (rc)

		printk(KERN_WARNING

		       "i2c-powermac.c: Failed to remove bus %s !\n",

		       adapter->name);

	platform_set_drvdata(dev, NULL);

	kfree(adapter);

	memset(adapter, 0, sizeof(*adapter));



	return 0;

}
@@ -261,23 +258,17 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev) 
	snprintf(name, 32, "%s %d", basename, pmac_i2c_get_channel(bus));

	of_node_put(parent);



	adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);

	if (adapter == NULL) {

		printk(KERN_ERR "i2c-powermac: can't allocate inteface !\n");

		return -ENOMEM;

	}

	adapter = pmac_i2c_get_adapter(bus);

	platform_set_drvdata(dev, adapter);

	strcpy(adapter->name, name);

	adapter->algo = &i2c_powermac_algorithm;

	i2c_set_adapdata(adapter, bus);

	adapter->dev.parent = &dev->dev;

	pmac_i2c_attach_adapter(bus, adapter);

	rc = i2c_add_adapter(adapter);

	if (rc) {

		printk(KERN_ERR "i2c-powermac: Adapter %s registration "

		       "failed\n", name);

		i2c_set_adapdata(adapter, NULL);

		pmac_i2c_detach_adapter(bus, adapter);

		memset(adapter, 0, sizeof(*adapter));

	}



	printk(KERN_INFO "PowerMac i2c bus %s registered\n", name);