staging: iio: hmc5843: Set iio name dynamically based on i2c name

PATCH Superseded [email protected] 2 participants 3 messages Aug 12, 2015

Subsystems (3)

Staging IIO Staging - industrial io

lore

Share & tools

lore

[email protected]

author

2015-08-12 08:22 UTC #0 lore raw

PATCH 1/1 staging: iio: hmc5843: Set iio name dynamically based on i2c name

From: Yong Li <[email protected]>

Load the driver using the below command:
echo hmc5983 0x1e > /sys/bus/i2c/devices/i2c-?/new_device

In sysfs, the iio name is hmc5843, however the i2c name is hmc5983, they are inconsistent.

With this patch, the iio name will be the same as the i2c device name

Signed-off-by Yong Li <[email protected]>

---
 drivers/staging/iio/magnetometer/hmc5843_i2c.c | 1 +
 1 file changed, 1 insertion(+)

drivers/staging/iio/magnetometer/hmc5843_i2c.c +1 -0

index ff08667..3b03644 100644
@@ -59,6 +59,7 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {
 static int hmc5843_i2c_probe(struct i2c_client *cli,
 			     const struct i2c_device_id *id)
 {
+	cli->dev.driver->name = id->name;
 	return hmc5843_common_probe(&cli->dev,
 			devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config),
 			id->driver_data);

Signature · 1 line

2.1.0

Lars-Peter Clausen

2015-08-12 08:28 UTC #1 lore raw

Quoted 20 lines · On 08/12/2015 10:20 AM, [email protected] wrote:

From: Yong Li <[email protected]>
Load the driver using the below command:
echo hmc5983 0x1e > /sys/bus/i2c/devices/i2c-?/new_device
In sysfs, the iio name is hmc5843, however the i2c name is hmc5983, they are inconsistent.
With this patch, the iio name will be the same as the i2c device name
Signed-off-by Yong Li <[email protected]>
---
 drivers/staging/iio/magnetometer/hmc5843_i2c.c | 1 +
 1 file changed, 1 insertion(+)
drivers/staging/iio/magnetometer/hmc5843_i2c.c +0 -0
index ff08667..3b03644 100644

drivers/staging/iio/magnetometer/hmc5843_i2c.c static const struct regmap_config hmc5843_i2c_regmap_config = { · line 62

Quoted 4 lines

drivers/staging/iio/magnetometer/hmc5843_i2c.c +1 -0

@@ -59,6 +59,7 @@ static const struct regmap_config hmc5843_i2c_regmap_config = {
 static int hmc5843_i2c_probe(struct i2c_client *cli,
 			     const struct i2c_device_id *id)
 {
+	cli->dev.driver->name = id->name;

You are overwriting a the name of the driver, which is a struct that is shared between all instances of the device which specific data from one device. That is most certainly not correct.

Update hmc5843_common_probe() and add a parameter that takes the name for the device and then pass the id->name when the function is called.

Quoted 4 lines

drivers/staging/iio/magnetometer/hmc5843_i2c.c +0 -0

 	return hmc5843_common_probe(&cli->dev,
 			devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config),
 			id->driver_data);

dGhhbmtzIGZvciB5b3VyIGNvbW1lbnRzLiBsZXQgbWUgc3VibWl0IGFub3RoZXIgb25lDQoNCrei 19TO0rXEIGlQaG9uZQ0KDQo+INTaIDIwMTXE6jjUwjEyyNWjrDE2OjI4o6xMYXJzLVBldGVyIENs YXVzZW4gPGxhcnNAbWV0YWZvby5kZT4g0LS1wKO6DQo+IA0KPj4gT24gMDgvMTIvMjAxNSAxMDoy MCBBTSwgc2RsaXlvbmdAZ21haWwuY29tIHdyb3RlOg0KPj4gRnJvbTogWW9uZyBMaSA8c2RsaXlv bmdAZ21haWwuY29tPg0KPj4gDQo+PiBMb2FkIHRoZSBkcml2ZXIgdXNpbmcgdGhlIGJlbG93IGNv bW1hbmQ6DQo+PiBlY2hvIGhtYzU5ODMgMHgxZSA+IC9zeXMvYnVzL2kyYy9kZXZpY2VzL2kyYy0/ L25ld19kZXZpY2UNCj4+IA0KPj4gSW4gc3lzZnMsIHRoZSBpaW8gbmFtZSBpcyBobWM1ODQzLCBo b3dldmVyIHRoZSBpMmMgbmFtZSBpcyBobWM1OTgzLA0KPj4gdGhleSBhcmUgaW5jb25zaXN0ZW50 Lg0KPj4gDQo+PiBXaXRoIHRoaXMgcGF0Y2gsIHRoZSBpaW8gbmFtZSB3aWxsIGJlIHRoZSBzYW1l IGFzIHRoZSBpMmMgZGV2aWNlIG5hbWUNCj4+IA0KPj4gU2lnbmVkLW9mZi1ieTogWW9uZyBMaSA8 c2RsaXlvbmdAZ21haWwuY29tPg0KPj4gLS0tDQo+PiBkcml2ZXJzL3N0YWdpbmcvaWlvL21hZ25l dG9tZXRlci9obWM1ODQzX2kyYy5jIHwgMSArDQo+PiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRp b24oKykNCj4+IA0KPj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvc3RhZ2luZy9paW8vbWFnbmV0b21l dGVyL2htYzU4NDNfaTJjLmMgYi9kcml2ZXJzL3N0YWdpbmcvaWlvL21hZ25ldG9tZXRlci9obWM1 ODQzX2kyYy5jDQo+PiBpbmRleCBmZjA4NjY3Li4zYjAzNjQ0IDEwMDY0NA0KPj4gLS0tIGEvZHJp dmVycy9zdGFnaW5nL2lpby9tYWduZXRvbWV0ZXIvaG1jNTg0M19pMmMuYw0KPj4gKysrIGIvZHJp dmVycy9zdGFnaW5nL2lpby9tYWduZXRvbWV0ZXIvaG1jNTg0M19pMmMuYw0KPj4gQEAgLTU5LDYg KzU5LDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCByZWdtYXBfY29uZmlnIGhtYzU4NDNfaTJjX3Jl Z21hcF9jb25maWcgPSB7DQo+PiBzdGF0aWMgaW50IGhtYzU4NDNfaTJjX3Byb2JlKHN0cnVjdCBp MmNfY2xpZW50ICpjbGksDQo+PiAgICAgICAgICAgICAgICAgY29uc3Qgc3RydWN0IGkyY19kZXZp Y2VfaWQgKmlkKQ0KPj4gew0KPj4gKyAgICBjbGktPmRldi5kcml2ZXItPm5hbWUgPSBpZC0+bmFt ZTsNCj4gDQo+IFlvdSBhcmUgb3ZlcndyaXRpbmcgYSB0aGUgbmFtZSBvZiB0aGUgZHJpdmVyLCB3 aGljaCBpcyBhIHN0cnVjdCB0aGF0IGlzDQo+IHNoYXJlZCBiZXR3ZWVuIGFsbCBpbnN0YW5jZXMg b2YgdGhlIGRldmljZSB3aGljaCBzcGVjaWZpYyBkYXRhIGZyb20gb25lDQo+IGRldmljZS4gVGhh dCBpcyBtb3N0IGNlcnRhaW5seSBub3QgY29ycmVjdC4NCj4gDQo+IFVwZGF0ZSBobWM1ODQzX2Nv bW1vbl9wcm9iZSgpIGFuZCBhZGQgYSBwYXJhbWV0ZXIgdGhhdCB0YWtlcyB0aGUgbmFtZSBmb3IN Cj4gdGhlIGRldmljZSBhbmQgdGhlbiBwYXNzIHRoZSBpZC0+bmFtZSB3aGVuIHRoZSBmdW5jdGlv biBpcyBjYWxsZWQuDQo+IA0KPj4gICAgcmV0dXJuIGhtYzU4NDNfY29tbW9uX3Byb2JlKCZjbGkt PmRldiwNCj4+ICAgICAgICAgICAgZGV2bV9yZWdtYXBfaW5pdF9pMmMoY2xpLCAmaG1jNTg0M19p MmNfcmVnbWFwX2NvbmZpZyksDQo+PiAgICAgICAgICAgIGlkLT5kcml2ZXJfZGF0YSk7DQo+PiAN Cj4gDQo=