adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-04 23:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DRIVER MODEL] Fix merge clashes with ARM ixp2000 / ixp4xx platforms

Browse source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-11-17 15:47:30 +00:00 committed by Russell King
parent 0db169f970
commit 7d78c887a9
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/i2c/busses/i2c-ixp2000.c
View file

@ -36,8 +36,6 @@
#include <asm/hardware.h> /* Pick up IXP2000-specific bits */ #include <asm/hardware.h> /* Pick up IXP2000-specific bits */
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
static struct device_driver ixp2000_i2c_driver;
static inline int ixp2000_scl_pin(void *data) static inline int ixp2000_scl_pin(void *data)
{ {
return ((struct ixp2000_i2c_pins*)data)->scl_pin; return ((struct ixp2000_i2c_pins*)data)->scl_pin;
@ -120,7 +118,7 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
drv_data->algo_data.timeout = 100; drv_data->algo_data.timeout = 100;
drv_data->adapter.id = I2C_HW_B_IXP2000, drv_data->adapter.id = I2C_HW_B_IXP2000,
strlcpy(drv_data->adapter.name, ixp2000_i2c_driver.name, strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
I2C_NAME_SIZE); I2C_NAME_SIZE);
drv_data->adapter.algo_data = &drv_data->algo_data, drv_data->adapter.algo_data = &drv_data->algo_data,
@ -132,7 +130,7 @@ static int ixp2000_i2c_probe(struct platform_device *plat_dev)
gpio_line_set(gpio->sda_pin, 0); gpio_line_set(gpio->sda_pin, 0);
if ((err = i2c_bit_add_bus(&drv_data->adapter)) != 0) { if ((err = i2c_bit_add_bus(&drv_data->adapter)) != 0) {
dev_err(dev, "Could not install, error %d\n", err); dev_err(&plat_dev->dev, "Could not install, error %d\n", err);
kfree(drv_data); kfree(drv_data);
return err; return err;
} }

6
drivers/i2c/busses/i2c-ixp4xx.c
View file

@ -35,8 +35,6 @@
#include <asm/hardware.h> /* Pick up IXP4xx-specific bits */ #include <asm/hardware.h> /* Pick up IXP4xx-specific bits */
static struct device_driver ixp4xx_i2c_driver;
static inline int ixp4xx_scl_pin(void *data) static inline int ixp4xx_scl_pin(void *data)
{ {
return ((struct ixp4xx_i2c_pins*)data)->scl_pin; return ((struct ixp4xx_i2c_pins*)data)->scl_pin;
@ -128,7 +126,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
drv_data->algo_data.timeout = 100; drv_data->algo_data.timeout = 100;
drv_data->adapter.id = I2C_HW_B_IXP4XX; drv_data->adapter.id = I2C_HW_B_IXP4XX;
strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.name, strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
I2C_NAME_SIZE); I2C_NAME_SIZE);
drv_data->adapter.algo_data = &drv_data->algo_data; drv_data->adapter.algo_data = &drv_data->algo_data;
@ -140,7 +138,7 @@ static int ixp4xx_i2c_probe(struct platform_device *plat_dev)
gpio_line_set(gpio->sda_pin, 0); gpio_line_set(gpio->sda_pin, 0);
if ((err = i2c_bit_add_bus(&drv_data->adapter) != 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); kfree(drv_data);
return err; return err;

22
drivers/mtd/maps/ixp2000.c
View file

@ -159,12 +159,12 @@ static int ixp2000_flash_probe(struct platform_device *dev)
return -ENODEV; return -ENODEV;
window_size = dev->resource->end - dev->resource->start + 1; window_size = dev->resource->end - dev->resource->start + 1;
dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n", dev_info(&dev->dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
ixp_data->nr_banks, ((u32)window_size >> 20)); ixp_data->nr_banks, ((u32)window_size >> 20));
if (plat->width != 1) { if (plat->width != 1) {
dev_err(_dev, "IXP2000 MTD map only supports 8-bit mode, asking for %d\n", dev_err(&dev->dev, "IXP2000 MTD map only supports 8-bit mode, asking for %d\n",
plat->width * 8); plat->width * 8);
return -EIO; return -EIO;
} }
@ -202,7 +202,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
dev->resource->end - dev->resource->start + 1, dev->resource->end - dev->resource->start + 1,
dev->dev.bus_id); dev->dev.bus_id);
if (!info->res) { if (!info->res) {
dev_err(_dev, "Could not reserve memory region\n"); dev_err(&dev->dev, "Could not reserve memory region\n");
err = -ENOMEM; err = -ENOMEM;
goto Error; goto Error;
} }
@ -210,7 +210,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start, info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
dev->resource->end - dev->resource->start + 1); dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) { if (!info->map.map_priv_1) {
dev_err(_dev, "Failed to ioremap flash region\n"); dev_err(&dev->dev, "Failed to ioremap flash region\n");
err = -EIO; err = -EIO;
goto Error; goto Error;
} }
@ -221,13 +221,13 @@ static int ixp2000_flash_probe(struct platform_device *dev)
*/ */
erratum44_workaround = ixp2000_has_broken_slowport(); erratum44_workaround = ixp2000_has_broken_slowport();
dev_info(_dev, "Erratum 44 workaround %s\n", dev_info(&dev->dev, "Erratum 44 workaround %s\n",
erratum44_workaround ? "enabled" : "disabled"); erratum44_workaround ? "enabled" : "disabled");
#endif #endif
info->mtd = do_map_probe(plat->map_name, &info->map); info->mtd = do_map_probe(plat->map_name, &info->map);
if (!info->mtd) { if (!info->mtd) {
dev_err(_dev, "map_probe failed\n"); dev_err(&dev->dev, "map_probe failed\n");
err = -ENXIO; err = -ENXIO;
goto Error; goto Error;
} }
@ -237,7 +237,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
if (err > 0) { if (err > 0) {
err = add_mtd_partitions(info->mtd, info->partitions, err); err = add_mtd_partitions(info->mtd, info->partitions, err);
if(err) if(err)
dev_err(_dev, "Could not parse partitions\n"); dev_err(&dev->dev, "Could not parse partitions\n");
} }
if (err) if (err)
@ -251,8 +251,8 @@ Error:
} }
static struct platform_driver ixp2000_flash_driver = { static struct platform_driver ixp2000_flash_driver = {
.probe = &ixp2000_flash_probe, .probe = ixp2000_flash_probe,
.remove = &ixp2000_flash_remove .remove = ixp2000_flash_remove,
.driver = { .driver = {
.name = "IXP2000-Flash", .name = "IXP2000-Flash",
}, },