aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi/mpc512x_psc_spi.c
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2010-07-05 06:17:51 -0400
committerGrant Likely <grant.likely@secretlab.ca>2010-07-05 13:34:07 -0400
commitcf40f082f8d3a98e28af02af20d00d2500eb6a65 (patch)
tree8301ec15b211c9d5647f629777d539ece23e8688 /drivers/spi/mpc512x_psc_spi.c
parentb8f2e7bb6cff43efc4fa753761357cc7b7b13d26 (diff)
spi/mpc5121: change annotations for probe and remove functions
Change annotations from __init/__exit to __devinit/__devexit to get rid of section mismatch warning. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi/mpc512x_psc_spi.c')
-rw-r--r--drivers/spi/mpc512x_psc_spi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/spi/mpc512x_psc_spi.c b/drivers/spi/mpc512x_psc_spi.c
index 2534b1ec3edd..c8d69fc393ab 100644
--- a/drivers/spi/mpc512x_psc_spi.c
+++ b/drivers/spi/mpc512x_psc_spi.c
@@ -405,9 +405,9 @@ static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id)
405} 405}
406 406
407/* bus_num is used only for the case dev->platform_data == NULL */ 407/* bus_num is used only for the case dev->platform_data == NULL */
408static int __init mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, 408static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
409 u32 size, unsigned int irq, 409 u32 size, unsigned int irq,
410 s16 bus_num) 410 s16 bus_num)
411{ 411{
412 struct fsl_spi_platform_data *pdata = dev->platform_data; 412 struct fsl_spi_platform_data *pdata = dev->platform_data;
413 struct mpc512x_psc_spi *mps; 413 struct mpc512x_psc_spi *mps;
@@ -490,7 +490,7 @@ free_master:
490 return ret; 490 return ret;
491} 491}
492 492
493static int __exit mpc512x_psc_spi_do_remove(struct device *dev) 493static int __devexit mpc512x_psc_spi_do_remove(struct device *dev)
494{ 494{
495 struct spi_master *master = dev_get_drvdata(dev); 495 struct spi_master *master = dev_get_drvdata(dev);
496 struct mpc512x_psc_spi *mps = spi_master_get_devdata(master); 496 struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
@@ -505,8 +505,8 @@ static int __exit mpc512x_psc_spi_do_remove(struct device *dev)
505 return 0; 505 return 0;
506} 506}
507 507
508static int __init mpc512x_psc_spi_of_probe(struct of_device *op, 508static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
509 const struct of_device_id *match) 509 const struct of_device_id *match)
510{ 510{
511 const u32 *regaddr_p; 511 const u32 *regaddr_p;
512 u64 regaddr64, size64; 512 u64 regaddr64, size64;
@@ -537,7 +537,7 @@ static int __init mpc512x_psc_spi_of_probe(struct of_device *op,
537 irq_of_parse_and_map(op->dev.of_node, 0), id); 537 irq_of_parse_and_map(op->dev.of_node, 0), id);
538} 538}
539 539
540static int __exit mpc512x_psc_spi_of_remove(struct of_device *op) 540static int __devexit mpc512x_psc_spi_of_remove(struct of_device *op)
541{ 541{
542 return mpc512x_psc_spi_do_remove(&op->dev); 542 return mpc512x_psc_spi_do_remove(&op->dev);
543} 543}
@@ -551,7 +551,7 @@ MODULE_DEVICE_TABLE(of, mpc512x_psc_spi_of_match);
551 551
552static struct of_platform_driver mpc512x_psc_spi_of_driver = { 552static struct of_platform_driver mpc512x_psc_spi_of_driver = {
553 .probe = mpc512x_psc_spi_of_probe, 553 .probe = mpc512x_psc_spi_of_probe,
554 .remove = __exit_p(mpc512x_psc_spi_of_remove), 554 .remove = __devexit_p(mpc512x_psc_spi_of_remove),
555 .driver = { 555 .driver = {
556 .name = "mpc512x-psc-spi", 556 .name = "mpc512x-psc-spi",
557 .owner = THIS_MODULE, 557 .owner = THIS_MODULE,