From 90e01543492f832ca96130aae457e067c622960f Mon Sep 17 00:00:00 2001 From: Russell King Date: Fri, 20 Feb 2004 19:42:14 +0000 Subject: [PATCH] [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. --- drivers/acorn/char/i2c.c | 3 --- drivers/acorn/char/pcf8583.c | 7 ++----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/acorn/char/i2c.c b/drivers/acorn/char/i2c.c index 997cf28f4b752..cb662980f90eb 100644 --- a/drivers/acorn/char/i2c.c +++ b/drivers/acorn/char/i2c.c @@ -311,9 +311,6 @@ static struct i2c_adapter ioc_ops = { .algo_data = &ioc_data, .client_register = ioc_client_reg, .client_unregister = ioc_client_unreg, - .dev = { - .name = "IOC/IOMD", - }, }; static int __init i2c_ioc_init(void) diff --git a/drivers/acorn/char/pcf8583.c b/drivers/acorn/char/pcf8583.c index 6cf9e9259ceff..ad768a18780fb 100644 --- a/drivers/acorn/char/pcf8583.c +++ b/drivers/acorn/char/pcf8583.c @@ -37,8 +37,7 @@ static struct i2c_client_address_data addr_data = { #define DAT(x) ((unsigned int)(x->dev.driver_data)) static int -pcf8583_attach(struct i2c_adapter *adap, int addr, unsigned short flags, - int kind) +pcf8583_attach(struct i2c_adapter *adap, int addr, int kind) { struct i2c_client *c; unsigned char buf[1], ad[1] = { 0 }; @@ -51,13 +50,11 @@ pcf8583_attach(struct i2c_adapter *adap, int addr, unsigned short flags, if (!c) return -ENOMEM; - strcpy(c->dev.name, "PCF8583"); + memset(c, 0, sizeof(*c)); c->id = pcf8583_driver.id; - c->flags = 0; c->addr = addr; c->adapter = adap; c->driver = &pcf8583_driver; - c->dev.driver_data = NULL; if (i2c_transfer(c->adapter, msgs, 2) == 2) DAT(c) = buf[0]; -- 2.53.0