diff options
author | Bill Richardson <wfrichar@chromium.org> | 2014-06-18 14:14:03 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2014-07-09 09:58:18 -0400 |
commit | 533cec8f34778de10412dfabac991cf458ebf3c9 (patch) | |
tree | dd08a5262f40270b94ac1ecb390d59cc6729e3c9 | |
parent | 5d4773e27e8ab37491767a6ef99ffd7100fe6341 (diff) |
mfd: cros_ec: cleanup: remove unused fields from struct cros_ec_device
struct cros_ec_device has a superfluous "name" field. We can get all the
debugging info we need from the existing ec_name and phys_name fields, so
let's take out the extra field.
The printout also has sufficient info in it without explicitly adding
the transport. Before this change:
cros-ec-spi spi2.0: Chrome EC (SPI)
After this change:
cros-ec-spi spi2.0: Chrome EC device registered
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Signed-off-by: Doug Anderson <dianders@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/cros_ec.c | 2 | ||||
-rw-r--r-- | drivers/mfd/cros_ec_i2c.c | 1 | ||||
-rw-r--r-- | drivers/mfd/cros_ec_spi.c | 1 | ||||
-rw-r--r-- | include/linux/mfd/cros_ec.h | 2 |
4 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index 2e86c282f0b4..49ed8c340868 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c | |||
@@ -140,7 +140,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) | |||
140 | goto fail_mfd; | 140 | goto fail_mfd; |
141 | } | 141 | } |
142 | 142 | ||
143 | dev_info(dev, "Chrome EC (%s)\n", ec_dev->name); | 143 | dev_info(dev, "Chrome EC device registered\n"); |
144 | 144 | ||
145 | return 0; | 145 | return 0; |
146 | 146 | ||
diff --git a/drivers/mfd/cros_ec_i2c.c b/drivers/mfd/cros_ec_i2c.c index 37ed12f99560..5bb32f5550b3 100644 --- a/drivers/mfd/cros_ec_i2c.c +++ b/drivers/mfd/cros_ec_i2c.c | |||
@@ -132,7 +132,6 @@ static int cros_ec_i2c_probe(struct i2c_client *client, | |||
132 | return -ENOMEM; | 132 | return -ENOMEM; |
133 | 133 | ||
134 | i2c_set_clientdata(client, ec_dev); | 134 | i2c_set_clientdata(client, ec_dev); |
135 | ec_dev->name = "I2C"; | ||
136 | ec_dev->dev = dev; | 135 | ec_dev->dev = dev; |
137 | ec_dev->priv = client; | 136 | ec_dev->priv = client; |
138 | ec_dev->irq = client->irq; | 137 | ec_dev->irq = client->irq; |
diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c index bef7735ecfde..6e929b5f3bd3 100644 --- a/drivers/mfd/cros_ec_spi.c +++ b/drivers/mfd/cros_ec_spi.c | |||
@@ -370,7 +370,6 @@ static int cros_ec_spi_probe(struct spi_device *spi) | |||
370 | cros_ec_spi_dt_probe(ec_spi, dev); | 370 | cros_ec_spi_dt_probe(ec_spi, dev); |
371 | 371 | ||
372 | spi_set_drvdata(spi, ec_dev); | 372 | spi_set_drvdata(spi, ec_dev); |
373 | ec_dev->name = "SPI"; | ||
374 | ec_dev->dev = dev; | 373 | ec_dev->dev = dev; |
375 | ec_dev->priv = ec_spi; | 374 | ec_dev->priv = ec_spi; |
376 | ec_dev->irq = spi->irq; | 375 | ec_dev->irq = spi->irq; |
diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index f27c03766069..2b0c5982dbc1 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h | |||
@@ -67,7 +67,6 @@ struct cros_ec_command { | |||
67 | * @command_recv: receive a response | 67 | * @command_recv: receive a response |
68 | * @command_sendrecv: send a command and receive a response | 68 | * @command_sendrecv: send a command and receive a response |
69 | * | 69 | * |
70 | * @name: Name of this EC interface | ||
71 | * @priv: Private data | 70 | * @priv: Private data |
72 | * @irq: Interrupt to use | 71 | * @irq: Interrupt to use |
73 | * @din: input buffer (for data from EC) | 72 | * @din: input buffer (for data from EC) |
@@ -104,7 +103,6 @@ struct cros_ec_device { | |||
104 | void *in_buf, int in_len); | 103 | void *in_buf, int in_len); |
105 | 104 | ||
106 | /* These are used to implement the platform-specific interface */ | 105 | /* These are used to implement the platform-specific interface */ |
107 | const char *name; | ||
108 | void *priv; | 106 | void *priv; |
109 | int irq; | 107 | int irq; |
110 | uint8_t *din; | 108 | uint8_t *din; |