Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual fixups to ARM ixp4xxx by hand.
+15
-20
+2
-4
drivers/i2c/busses/i2c-ixp2000.c
+2
-4
drivers/i2c/busses/i2c-ixp2000.c
···
36
36
#include <asm/hardware.h> /* Pick up IXP2000-specific bits */
37
37
#include <asm/arch/gpio.h>
38
38
39
-
static struct device_driver ixp2000_i2c_driver;
40
-
41
39
static inline int ixp2000_scl_pin(void *data)
42
40
{
43
41
return ((struct ixp2000_i2c_pins*)data)->scl_pin;
···
118
120
drv_data->algo_data.timeout = 100;
119
121
120
122
drv_data->adapter.id = I2C_HW_B_IXP2000,
121
-
strlcpy(drv_data->adapter.name, ixp2000_i2c_driver.name,
123
+
strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
122
124
I2C_NAME_SIZE);
123
125
drv_data->adapter.algo_data = &drv_data->algo_data,
124
126
···
130
132
gpio_line_set(gpio->sda_pin, 0);
131
133
132
134
if ((err = i2c_bit_add_bus(&drv_data->adapter)) != 0) {
133
-
dev_err(dev, "Could not install, error %d\n", err);
135
+
dev_err(&plat_dev->dev, "Could not install, error %d\n", err);
134
136
kfree(drv_data);
135
137
return err;
136
138
}
+2
-5
drivers/i2c/busses/i2c-ixp4xx.c
+2
-5
drivers/i2c/busses/i2c-ixp4xx.c
···
35
35
36
36
#include <asm/hardware.h> /* Pick up IXP4xx-specific bits */
37
37
38
-
static struct platform_driver ixp4xx_i2c_driver;
39
-
40
38
static inline int ixp4xx_scl_pin(void *data)
41
39
{
42
40
return ((struct ixp4xx_i2c_pins*)data)->scl_pin;
···
126
128
drv_data->algo_data.timeout = 100;
127
129
128
130
drv_data->adapter.id = I2C_HW_B_IXP4XX;
129
-
strlcpy(drv_data->adapter.name, ixp4xx_i2c_driver.driver.name,
131
+
strlcpy(drv_data->adapter.name, plat_dev->dev.driver->name,
130
132
I2C_NAME_SIZE);
131
133
drv_data->adapter.algo_data = &drv_data->algo_data;
132
134
···
138
140
gpio_line_set(gpio->sda_pin, 0);
139
141
140
142
if ((err = i2c_bit_add_bus(&drv_data->adapter) != 0)) {
141
-
printk(KERN_ERR "ERROR: Could not install %s\n",
142
-
plat_dev->dev.bus_id);
143
+
printk(KERN_ERR "ERROR: Could not install %s\n", plat_dev->dev.bus_id);
143
144
144
145
kfree(drv_data);
145
146
return err;
+11
-11
drivers/mtd/maps/ixp2000.c
+11
-11
drivers/mtd/maps/ixp2000.c
···
159
159
return -ENODEV;
160
160
161
161
window_size = dev->resource->end - dev->resource->start + 1;
162
-
dev_info(_dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
163
-
ixp_data->nr_banks, ((u32)window_size >> 20));
162
+
dev_info(&dev->dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
163
+
ixp_data->nr_banks, ((u32)window_size >> 20));
164
164
165
165
if (plat->width != 1) {
166
-
dev_err(_dev, "IXP2000 MTD map only supports 8-bit mode, asking for %d\n",
167
-
plat->width * 8);
166
+
dev_err(&dev->dev, "IXP2000 MTD map only supports 8-bit mode, asking for %d\n",
167
+
plat->width * 8);
168
168
return -EIO;
169
169
}
170
170
···
202
202
dev->resource->end - dev->resource->start + 1,
203
203
dev->dev.bus_id);
204
204
if (!info->res) {
205
-
dev_err(_dev, "Could not reserve memory region\n");
205
+
dev_err(&dev->dev, "Could not reserve memory region\n");
206
206
err = -ENOMEM;
207
207
goto Error;
208
208
}
···
210
210
info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
211
211
dev->resource->end - dev->resource->start + 1);
212
212
if (!info->map.map_priv_1) {
213
-
dev_err(_dev, "Failed to ioremap flash region\n");
213
+
dev_err(&dev->dev, "Failed to ioremap flash region\n");
214
214
err = -EIO;
215
215
goto Error;
216
216
}
···
221
221
*/
222
222
223
223
erratum44_workaround = ixp2000_has_broken_slowport();
224
-
dev_info(_dev, "Erratum 44 workaround %s\n",
224
+
dev_info(&dev->dev, "Erratum 44 workaround %s\n",
225
225
erratum44_workaround ? "enabled" : "disabled");
226
226
#endif
227
227
228
228
info->mtd = do_map_probe(plat->map_name, &info->map);
229
229
if (!info->mtd) {
230
-
dev_err(_dev, "map_probe failed\n");
230
+
dev_err(&dev->dev, "map_probe failed\n");
231
231
err = -ENXIO;
232
232
goto Error;
233
233
}
···
237
237
if (err > 0) {
238
238
err = add_mtd_partitions(info->mtd, info->partitions, err);
239
239
if(err)
240
-
dev_err(_dev, "Could not parse partitions\n");
240
+
dev_err(&dev->dev, "Could not parse partitions\n");
241
241
}
242
242
243
243
if (err)
···
251
251
}
252
252
253
253
static struct platform_driver ixp2000_flash_driver = {
254
-
.probe = &ixp2000_flash_probe,
255
-
.remove = &ixp2000_flash_remove
254
+
.probe = ixp2000_flash_probe,
255
+
.remove = ixp2000_flash_remove,
256
256
.driver = {
257
257
.name = "IXP2000-Flash",
258
258
},