Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf40f082 authored by Anatolij Gustschin's avatar Anatolij Gustschin Committed by Grant Likely
Browse files

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: default avatarAnatolij Gustschin <agust@denx.de>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent b8f2e7bb

drivers/spi/mpc512x_psc_spi.c

+8 −8
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static irqreturn_t mpc512x_psc_spi_isr(int irq, void *dev_id) 
}



/* 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,

static int __devinit mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,

					      u32 size, unsigned int irq,

					      s16 bus_num)

{
@@ -490,7 +490,7 @@ free_master: 
	return ret;

}



static int __exit mpc512x_psc_spi_do_remove(struct device *dev)

static int __devexit 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);
@@ -505,7 +505,7 @@ static int __exit mpc512x_psc_spi_do_remove(struct device *dev) 
	return 0;

}



static int __init mpc512x_psc_spi_of_probe(struct of_device *op,

static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,

					      const struct of_device_id *match)

{

	const u32 *regaddr_p;
@@ -537,7 +537,7 @@ static int __init mpc512x_psc_spi_of_probe(struct of_device *op, 
				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 of_device *op)

{

	return mpc512x_psc_spi_do_remove(&op->dev);

}
@@ -551,7 +551,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,

	.remove = __exit_p(mpc512x_psc_spi_of_remove),

	.remove = __devexit_p(mpc512x_psc_spi_of_remove),

	.driver = {

		.name = "mpc512x-psc-spi",

		.owner = THIS_MODULE,