projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
spidernet: autoneg support for Celleb
[powerpc.git]
/
drivers
/
spi
/
pxa2xx_spi.c
diff --git
a/drivers/spi/pxa2xx_spi.c
b/drivers/spi/pxa2xx_spi.c
index
dccdc50
..
9f2c887
100644
(file)
--- a/
drivers/spi/pxa2xx_spi.c
+++ b/
drivers/spi/pxa2xx_spi.c
@@
-1214,9
+1214,9
@@
static int setup(struct spi_device *spi)
return 0;
}
return 0;
}
-static void cleanup(
const
struct spi_device *spi)
+static void cleanup(struct spi_device *spi)
{
{
- struct chip_data *chip = spi_get_ctldata(
(struct spi_device *)
spi);
+ struct chip_data *chip = spi_get_ctldata(spi);
kfree(chip);
}
kfree(chip);
}
@@
-1234,7
+1234,7
@@
static int init_queue(struct driver_data *drv_data)
INIT_WORK(&drv_data->pump_messages, pump_messages);
drv_data->workqueue = create_singlethread_workqueue(
INIT_WORK(&drv_data->pump_messages, pump_messages);
drv_data->workqueue = create_singlethread_workqueue(
- drv_data->master->
dev.parent
->bus_id);
+ drv_data->master->
cdev.dev
->bus_id);
if (drv_data->workqueue == NULL)
return -EBUSY;
if (drv_data->workqueue == NULL)
return -EBUSY;