git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
spi
/
mpc512x_psc_spi.c
diff --git
a/drivers/spi/mpc512x_psc_spi.c
b/drivers/spi/mpc512x_psc_spi.c
index
10baac3
..
77d9e7e
100644
(file)
--- a/
drivers/spi/mpc512x_psc_spi.c
+++ b/
drivers/spi/mpc512x_psc_spi.c
@@
-406,9
+406,9
@@
static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id)
}
/* bus_num is used only for the case dev->platform_data == NULL */
}
/* bus_num is used only for the case dev->platform_data == NULL */
-static int __init mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
- u32 size, unsigned int irq,
- s16 bus_num)
+static int __
dev
init mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
+
u32 size, unsigned int irq,
+
s16 bus_num)
{
struct fsl_spi_platform_data *pdata = dev->platform_data;
struct mpc512x_psc_spi *mps;
{
struct fsl_spi_platform_data *pdata = dev->platform_data;
struct mpc512x_psc_spi *mps;
@@
-492,7
+492,7
@@
free_master:
return ret;
}
return ret;
}
-static int __exit mpc512x_psc_spi_do_remove(struct device *dev)
+static int __
dev
exit mpc512x_psc_spi_do_remove(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
{
struct spi_master *master = dev_get_drvdata(dev);
struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
@@
-507,8
+507,8
@@
static int __exit mpc512x_psc_spi_do_remove(struct device *dev)
return 0;
}
return 0;
}
-static int __
init mpc512x_psc_spi_of_probe(struct of
_device *op,
- const struct of_device_id *match)
+static int __
devinit mpc512x_psc_spi_of_probe(struct platform
_device *op,
+
const struct of_device_id *match)
{
const u32 *regaddr_p;
u64 regaddr64, size64;
{
const u32 *regaddr_p;
u64 regaddr64, size64;
@@
-539,7
+539,7
@@
static int __init mpc512x_psc_spi_of_probe(struct of_device *op,
irq_of_parse_and_map(op->dev.of_node, 0), id);
}
irq_of_parse_and_map(op->dev.of_node, 0), id);
}
-static int __
exit mpc512x_psc_spi_of_remove(struct of
_device *op)
+static int __
devexit mpc512x_psc_spi_of_remove(struct platform
_device *op)
{
return mpc512x_psc_spi_do_remove(&op->dev);
}
{
return mpc512x_psc_spi_do_remove(&op->dev);
}
@@
-553,7
+553,7
@@
MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match);
static struct of_platform_driver mpc512x_psc_spi_of_driver = {
.probe = mpc512x_psc_spi_of_probe,
static struct of_platform_driver mpc512x_psc_spi_of_driver = {
.probe = mpc512x_psc_spi_of_probe,
- .remove = __exit_p(mpc512x_psc_spi_of_remove),
+ .remove = __
dev
exit_p(mpc512x_psc_spi_of_remove),
.driver = {
.name = "mpc512x-psc-spi",
.owner = THIS_MODULE,
.driver = {
.name = "mpc512x-psc-spi",
.owner = THIS_MODULE,