of_platform_driver noise on sparce
switch to __init for those; unlike powerpc sparc has no hotplug support for that stuff and their ->probe() tends to call __init functions while being declared __devinit. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
30037818f7
Коммит
e669dae614
|
@ -455,7 +455,7 @@ static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit fire_probe(struct of_device *op,
|
||||
static int __init fire_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct device_node *dp = op->node;
|
||||
|
|
|
@ -493,7 +493,7 @@ static void __init psycho_pbm_init(struct pci_pbm_info *pbm,
|
|||
psycho_scan_bus(pbm, &op->dev);
|
||||
}
|
||||
|
||||
static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid)
|
||||
static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid)
|
||||
{
|
||||
struct pci_pbm_info *pbm;
|
||||
|
||||
|
@ -506,7 +506,7 @@ static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid)
|
|||
|
||||
#define PSYCHO_CONFIGSPACE 0x001000000UL
|
||||
|
||||
static int __devinit psycho_probe(struct of_device *op,
|
||||
static int __init psycho_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
const struct linux_prom64_registers *pr_regs;
|
||||
|
|
|
@ -929,7 +929,7 @@ static int __init pci_sun4v_pbm_init(struct pci_pbm_info *pbm,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit pci_sun4v_probe(struct of_device *op,
|
||||
static int __init pci_sun4v_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
const struct linux_prom64_registers *regs;
|
||||
|
|
|
@ -361,7 +361,7 @@ fail:
|
|||
extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);
|
||||
extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);
|
||||
|
||||
static int __devinit bbc_i2c_probe(struct of_device *op,
|
||||
static int __init bbc_i2c_probe(struct of_device *op,
|
||||
const struct of_device_id *match)
|
||||
{
|
||||
struct bbc_i2c_bus *bp;
|
||||
|
@ -386,7 +386,7 @@ static int __devinit bbc_i2c_probe(struct of_device *op,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int __devexit bbc_i2c_remove(struct of_device *op)
|
||||
static int __exit bbc_i2c_remove(struct of_device *op)
|
||||
{
|
||||
struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);
|
||||
|
||||
|
@ -417,7 +417,7 @@ static struct of_platform_driver bbc_i2c_driver = {
|
|||
.name = "bbc_i2c",
|
||||
.match_table = bbc_i2c_match,
|
||||
.probe = bbc_i2c_probe,
|
||||
.remove = __devexit_p(bbc_i2c_remove),
|
||||
.remove = __exit_p(bbc_i2c_remove),
|
||||
};
|
||||
|
||||
static int __init bbc_i2c_init(void)
|
||||
|
|
|
@ -1856,7 +1856,7 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __init cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
{
|
||||
struct resource *rp = &op->resource[0];
|
||||
struct snd_card *card;
|
||||
|
@ -2048,7 +2048,7 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __init cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)
|
||||
{
|
||||
struct snd_card *card;
|
||||
int err;
|
||||
|
@ -2072,7 +2072,7 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev
|
|||
}
|
||||
#endif
|
||||
|
||||
static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
|
||||
static int __init cs4231_probe(struct of_device *op, const struct of_device_id *match)
|
||||
{
|
||||
#ifdef EBUS_SUPPORT
|
||||
if (!strcmp(op->node->parent->name, "ebus"))
|
||||
|
@ -2086,7 +2086,7 @@ static int __devinit cs4231_probe(struct of_device *op, const struct of_device_i
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
static int __devexit cs4231_remove(struct of_device *op)
|
||||
static int __exit cs4231_remove(struct of_device *op)
|
||||
{
|
||||
struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
|
||||
|
||||
|
@ -2112,7 +2112,7 @@ static struct of_platform_driver cs4231_driver = {
|
|||
.name = "audio",
|
||||
.match_table = cs4231_match,
|
||||
.probe = cs4231_probe,
|
||||
.remove = __devexit_p(cs4231_remove),
|
||||
.remove = __exit_p(cs4231_remove),
|
||||
};
|
||||
|
||||
static int __init cs4231_init(void)
|
||||
|
|
Загрузка…
Ссылка в новой задаче