Commit 90e01543 authored by Russell King's avatar Russell King

[ARM] Make Acorn I2C build again.

Unfortunately some i2c drivers were missed when the "name" element of
struct device was removed.  This cset fixes these drivers.
parent 0b5a9b4c
...@@ -311,9 +311,6 @@ static struct i2c_adapter ioc_ops = { ...@@ -311,9 +311,6 @@ static struct i2c_adapter ioc_ops = {
.algo_data = &ioc_data, .algo_data = &ioc_data,
.client_register = ioc_client_reg, .client_register = ioc_client_reg,
.client_unregister = ioc_client_unreg, .client_unregister = ioc_client_unreg,
.dev = {
.name = "IOC/IOMD",
},
}; };
static int __init i2c_ioc_init(void) static int __init i2c_ioc_init(void)
......
...@@ -37,8 +37,7 @@ static struct i2c_client_address_data addr_data = { ...@@ -37,8 +37,7 @@ static struct i2c_client_address_data addr_data = {
#define DAT(x) ((unsigned int)(x->dev.driver_data)) #define DAT(x) ((unsigned int)(x->dev.driver_data))
static int static int
pcf8583_attach(struct i2c_adapter *adap, int addr, unsigned short flags, pcf8583_attach(struct i2c_adapter *adap, int addr, int kind)
int kind)
{ {
struct i2c_client *c; struct i2c_client *c;
unsigned char buf[1], ad[1] = { 0 }; unsigned char buf[1], ad[1] = { 0 };
...@@ -51,13 +50,11 @@ pcf8583_attach(struct i2c_adapter *adap, int addr, unsigned short flags, ...@@ -51,13 +50,11 @@ pcf8583_attach(struct i2c_adapter *adap, int addr, unsigned short flags,
if (!c) if (!c)
return -ENOMEM; return -ENOMEM;
strcpy(c->dev.name, "PCF8583"); memset(c, 0, sizeof(*c));
c->id = pcf8583_driver.id; c->id = pcf8583_driver.id;
c->flags = 0;
c->addr = addr; c->addr = addr;
c->adapter = adap; c->adapter = adap;
c->driver = &pcf8583_driver; c->driver = &pcf8583_driver;
c->dev.driver_data = NULL;
if (i2c_transfer(c->adapter, msgs, 2) == 2) if (i2c_transfer(c->adapter, msgs, 2) == 2)
DAT(c) = buf[0]; DAT(c) = buf[0];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment