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

Commit bc6286e5 authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c-powermac: Drop temporary name buffer 



We no longer need to write the adapter name to a temporary buffer.
We can write it directly to the i2c_adapter's name field. This is
more efficient.

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 6dfa5ca3

drivers/i2c/busses/i2c-powermac.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -224,12 +224,12 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev) 
	struct pmac_i2c_bus *bus = dev->dev.platform_data;

	struct pmac_i2c_bus *bus = dev->dev.platform_data;

	struct device_node *parent = NULL;

	struct device_node *parent = NULL;

	struct i2c_adapter *adapter;

	struct i2c_adapter *adapter;

	char name[32];

	const char *basename;

	const char *basename;

	int rc;

	int rc;





	if (bus == NULL)

	if (bus == NULL)

		return -EINVAL;

		return -EINVAL;

	adapter = pmac_i2c_get_adapter(bus);





	/* Ok, now we need to make up a name for the interface that will

	/* Ok, now we need to make up a name for the interface that will

	 * match what we used to do in the past, that is basically the

	 * match what we used to do in the past, that is basically the
@@ -255,23 +255,22 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev) 
	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}

	snprintf(name, 32, "%s %d", basename, pmac_i2c_get_channel(bus));

	snprintf(adapter->name, sizeof(adapter->name), "%s %d", basename,

		 pmac_i2c_get_channel(bus));

	of_node_put(parent);

	of_node_put(parent);





	adapter = pmac_i2c_get_adapter(bus);

	platform_set_drvdata(dev, adapter);

	platform_set_drvdata(dev, adapter);

	strcpy(adapter->name, name);

	adapter->algo = &i2c_powermac_algorithm;

	adapter->algo = &i2c_powermac_algorithm;

	i2c_set_adapdata(adapter, bus);

	i2c_set_adapdata(adapter, bus);

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

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

	rc = i2c_add_adapter(adapter);

	rc = i2c_add_adapter(adapter);

	if (rc) {

	if (rc) {

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

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

		       "failed\n", name);

		       "failed\n", adapter->name);

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

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

	}

	}





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

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





	if (!strncmp(basename, "uni-n", 5)) {

	if (!strncmp(basename, "uni-n", 5)) {

		struct device_node *np;

		struct device_node *np;