mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 01:31:44 +00:00
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>
This commit is contained in:
parent
b8f2e7bb6c
commit
cf40f082f8
@ -405,9 +405,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 */
|
||||
static int __init mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
|
||||
u32 size, unsigned int irq,
|
||||
s16 bus_num)
|
||||
static int __devinit 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;
|
||||
@ -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,8 +505,8 @@ 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,
|
||||
const struct of_device_id *match)
|
||||
static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
const u32 *regaddr_p;
|
||||
u64 regaddr64, size64;
|
||||
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user