[PATCH] Fix IXP4xx I2C driver build breakage

Deepak Saxena
2005-11-17T19:10:31Z

Platform device conversion missed a couple of spots.

Signed-off-by: Deepak Saxena <dsaxena@plexity.net>

diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index aa36855..f87220b 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -35,7 +35,7 @@

#include <asm/hardware.h> /* Pick up IXP4xx-specific bits */

-static struct device_driver ixp4xx_i2c_driver;
+static struct platform_driver ixp4xx_i2c_driver;

static inline int ixp4xx_scl_pin(void *data)
{
@@ -128,7 +128,7 @@ static int ixp4xx_i2c_probe(struct platf
drv_data->algo_data.timeout = 100;

drv_data->adapter.id = I2C_HW_B_IXP4XX;
- strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name,
+ strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.driver.name,
I2C_NAME_SIZE);
drv_data->adapter.algo_data = &drv_data->algo_data;

@@ -140,7 +140,8 @@ static int ixp4xx_i2c_probe(struct platf
gpio_line_set(gpio->sda_pin, 0);

if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) {
- printk(KERN_ERR "ERROR: Could not install %s\n", dev->bus_id);
+ printk(KERN_ERR "ERROR: Could not install %s\n",
+ plat_dev->dev.bus_id);

kfree(drv_data);
return err;

--
Deepak Saxena - dsaxena@plexity.net - http://www.plexity.net

"To question your government is not unpatriotic - to not question your
government is unpatriotic." - Senator Chuck Hagel (R-NE) - Nov 15, 2005