Commit b31366f4 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare

i2c: i2c_adapter devices need no driver

Kill i2c_adapter_driver as it doesn't make sense and it prevents
further i2c-core cleanups. i2c_adapter devices are virtual devices
(ex-class devices) and as such they don't need a driver.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent fccb56e4
...@@ -139,7 +139,6 @@ static int __init i2c_isa_init(void) ...@@ -139,7 +139,6 @@ static int __init i2c_isa_init(void)
isa_adapter.nr = ANY_I2C_ISA_BUS; isa_adapter.nr = ANY_I2C_ISA_BUS;
isa_adapter.dev.parent = &platform_bus; isa_adapter.dev.parent = &platform_bus;
sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr); sprintf(isa_adapter.dev.bus_id, "i2c-%d", isa_adapter.nr);
isa_adapter.dev.driver = &i2c_adapter_driver;
isa_adapter.dev.release = &i2c_adapter_dev_release; isa_adapter.dev.release = &i2c_adapter_dev_release;
isa_adapter.dev.class = &i2c_adapter_class; isa_adapter.dev.class = &i2c_adapter_class;
err = device_register(&isa_adapter.dev); err = device_register(&isa_adapter.dev);
......
...@@ -113,12 +113,6 @@ void i2c_adapter_dev_release(struct device *dev) ...@@ -113,12 +113,6 @@ void i2c_adapter_dev_release(struct device *dev)
complete(&adap->dev_released); complete(&adap->dev_released);
} }
struct device_driver i2c_adapter_driver = {
.owner = THIS_MODULE,
.name = "i2c_adapter",
.bus = &i2c_bus_type,
};
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
/* I2C bus adapters -- one roots each I2C or SMBUS segment */ /* I2C bus adapters -- one roots each I2C or SMBUS segment */
...@@ -202,7 +196,6 @@ int i2c_add_adapter(struct i2c_adapter *adap) ...@@ -202,7 +196,6 @@ int i2c_add_adapter(struct i2c_adapter *adap)
"physical device\n", adap->name); "physical device\n", adap->name);
} }
sprintf(adap->dev.bus_id, "i2c-%d", adap->nr); sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
adap->dev.driver = &i2c_adapter_driver;
adap->dev.release = &i2c_adapter_dev_release; adap->dev.release = &i2c_adapter_dev_release;
adap->dev.class = &i2c_adapter_class; adap->dev.class = &i2c_adapter_class;
res = device_register(&adap->dev); res = device_register(&adap->dev);
...@@ -575,9 +568,6 @@ static int __init i2c_init(void) ...@@ -575,9 +568,6 @@ static int __init i2c_init(void)
int retval; int retval;
retval = bus_register(&i2c_bus_type); retval = bus_register(&i2c_bus_type);
if (retval)
return retval;
retval = driver_register(&i2c_adapter_driver);
if (retval) if (retval)
return retval; return retval;
return class_register(&i2c_adapter_class); return class_register(&i2c_adapter_class);
...@@ -586,7 +576,6 @@ static int __init i2c_init(void) ...@@ -586,7 +576,6 @@ static int __init i2c_init(void)
static void __exit i2c_exit(void) static void __exit i2c_exit(void)
{ {
class_unregister(&i2c_adapter_class); class_unregister(&i2c_adapter_class);
driver_unregister(&i2c_adapter_driver);
bus_unregister(&i2c_bus_type); bus_unregister(&i2c_bus_type);
} }
...@@ -1174,9 +1163,8 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags, ...@@ -1174,9 +1163,8 @@ s32 i2c_smbus_xfer(struct i2c_adapter * adapter, u16 addr, unsigned short flags,
} }
/* Next four are needed by i2c-isa */ /* Next three are needed by i2c-isa */
EXPORT_SYMBOL_GPL(i2c_adapter_dev_release); EXPORT_SYMBOL_GPL(i2c_adapter_dev_release);
EXPORT_SYMBOL_GPL(i2c_adapter_driver);
EXPORT_SYMBOL_GPL(i2c_adapter_class); EXPORT_SYMBOL_GPL(i2c_adapter_class);
EXPORT_SYMBOL_GPL(i2c_bus_type); EXPORT_SYMBOL_GPL(i2c_bus_type);
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
/* --- For i2c-isa ---------------------------------------------------- */ /* --- For i2c-isa ---------------------------------------------------- */
extern void i2c_adapter_dev_release(struct device *dev); extern void i2c_adapter_dev_release(struct device *dev);
extern struct device_driver i2c_adapter_driver;
extern struct class i2c_adapter_class; extern struct class i2c_adapter_class;
extern struct bus_type i2c_bus_type; extern struct bus_type i2c_bus_type;
......
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