Re: i2c: struct device - replace bus_id with dev_name(),dev_set_name()

[Jean Delvare]

Hi Kay,

On Thu, 30 Oct 2008 02:29:21 +0100, Kay Sievers wrote:
> This patch is part of a larger patch series which will remove
> the "char bus_id[20]" name string from struct device. The device
> name is managed in the kobject anyway, and without any size
> limitation, and just needlessly copied into "struct device".
> 
> To set and read the device name dev_name(dev) and dev_set_name(dev)
> must be used. If your code uses static kobjects, which it shouldn't
> do, "const char *init_name" can be used to statically provide the
> name the registered device should have. At registration time, the
> init_name field is cleared, to enforce the use of dev_name(dev) to
> access the device name at a later time.
> 
> We need to get rid of all occurrences of bus_id in the entire tree
> to be able to enable the new interface. Please apply this patch,
> and possibly convert any remaining remaining occurrences of bus_id.

OK, I'll convert all other users under drivers/i2c.

> We want to submit a patch to -next, which will remove bus_id from
> "struct device", to find the remaining pieces to convert, and finally
> switch over to the new api, which will remove the 20 bytes array
> and does no longer have a size limitation.
>
> From: Kay Sievers <kay.sievers@xxxxxxxx>
> Subject: i2c: struct device - replace bus_id with dev_name(), dev_set_name()
> 
> Cc: Jean Delvare <khali@xxxxxxxxxxxx>
> Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
> Signed-Off-By: Kay Sievers <kay.sievers@xxxxxxxx>
> ---
> 
> 
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index 5a485c2..ce3cd48 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -459,7 +459,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
>  		pr_debug("I2C adapter driver [%s] forgot to specify "
>  			 "physical device\n", adap->name);
>  	}
> -	sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
> +	dev_set_name(&adap->dev, "i2c-%d", adap->nr);
>  	adap->dev.release = &i2c_adapter_dev_release;
>  	adap->dev.class = &i2c_adapter_class;
>  	res = device_register(&adap->dev);
> @@ -845,8 +845,7 @@ int i2c_attach_client(struct i2c_client *client)
>  	} else
>  		client->dev.release = i2c_client_dev_release;
>  
> -	snprintf(&client->dev.bus_id[0], sizeof(client->dev.bus_id),
> -		"%d-%04x", i2c_adapter_id(adapter), client->addr);
> +	dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adapter), client->addr);
>  	res = device_register(&client->dev);
>  	if (res)
>  		goto out_err;
> @@ -856,7 +855,7 @@ int i2c_attach_client(struct i2c_client *client)
>  	mutex_unlock(&adapter->clist_lock);
>  
>  	dev_dbg(&adapter->dev, "client [%s] registered with bus id %s\n",
> -		client->name, client->dev.bus_id);
> +		client->name, dev_name(&client->dev));
>  
>  	if (adapter->client_register)  {
>  		if (adapter->client_register(client)) {
> 
> 

Applied, with 2 checkpatch fixes, thanks.

-- 
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/