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

Commit 33b07db9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "of_platform_driver noise on sparce" 



This reverts commit e669dae6, since it
is incomplete, and clashes with fuller patches and the sparc 32/64
unification effort.

Requested-by: default avatarDavid Miller <davem@davemloft.net>
Acked-by: default avatarAl Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d9d060a9

arch/sparc64/kernel/pci_fire.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -455,7 +455,7 @@ static int __init pci_fire_pbm_init(struct pci_pbm_info *pbm, 
	return 0;

	return 0;

}

}





static int __init fire_probe(struct of_device *op,

static int __devinit fire_probe(struct of_device *op,

				const struct of_device_id *match)

				const struct of_device_id *match)

{

{

	struct device_node *dp = op->node;

	struct device_node *dp = op->node;

arch/sparc64/kernel/pci_psycho.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -493,7 +493,7 @@ static void __init psycho_pbm_init(struct pci_pbm_info *pbm, 
	psycho_scan_bus(pbm, &op->dev);

	psycho_scan_bus(pbm, &op->dev);

}

}





static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid)

static struct pci_pbm_info * __devinit psycho_find_sibling(u32 upa_portid)

{

{

	struct pci_pbm_info *pbm;

	struct pci_pbm_info *pbm;
@@ -506,7 +506,7 @@ static struct pci_pbm_info * __init psycho_find_sibling(u32 upa_portid) 




#define PSYCHO_CONFIGSPACE	0x001000000UL

#define PSYCHO_CONFIGSPACE	0x001000000UL





static int __init psycho_probe(struct of_device *op,

static int __devinit psycho_probe(struct of_device *op,

				  const struct of_device_id *match)

				  const struct of_device_id *match)

{

{

	const struct linux_prom64_registers *pr_regs;

	const struct linux_prom64_registers *pr_regs;

arch/sparc64/kernel/pci_sun4v.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -929,7 +929,7 @@ static int __init pci_sun4v_pbm_init(struct pci_pbm_info *pbm, 
	return 0;

	return 0;

}

}





static int __init pci_sun4v_probe(struct of_device *op,

static int __devinit pci_sun4v_probe(struct of_device *op,

				     const struct of_device_id *match)

				     const struct of_device_id *match)

{

{

	const struct linux_prom64_registers *regs;

	const struct linux_prom64_registers *regs;

drivers/sbus/char/bbc_i2c.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -361,7 +361,7 @@ fail: 
extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);

extern int bbc_envctrl_init(struct bbc_i2c_bus *bp);

extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);

extern void bbc_envctrl_cleanup(struct bbc_i2c_bus *bp);





static int __init bbc_i2c_probe(struct of_device *op,

static int __devinit bbc_i2c_probe(struct of_device *op,

				   const struct of_device_id *match)

				   const struct of_device_id *match)

{

{

	struct bbc_i2c_bus *bp;

	struct bbc_i2c_bus *bp;
@@ -386,7 +386,7 @@ static int __init bbc_i2c_probe(struct of_device *op, 
	return err;

	return err;

}

}





static int __exit bbc_i2c_remove(struct of_device *op)

static int __devexit bbc_i2c_remove(struct of_device *op)

{

{

	struct bbc_i2c_bus *bp = dev_get_drvdata(&op->dev);

	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",

	.name		= "bbc_i2c",

	.match_table	= bbc_i2c_match,

	.match_table	= bbc_i2c_match,

	.probe		= bbc_i2c_probe,

	.probe		= bbc_i2c_probe,

	.remove		= __exit_p(bbc_i2c_remove),

	.remove		= __devexit_p(bbc_i2c_remove),

};

};





static int __init bbc_i2c_init(void)

static int __init bbc_i2c_init(void)

sound/sparc/cs4231.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -1856,7 +1856,7 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card, 
	return 0;

	return 0;

}

}





static int __init cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)

static int __devinit cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)

{

{

	struct resource *rp = &op->resource[0];

	struct resource *rp = &op->resource[0];

	struct snd_card *card;

	struct snd_card *card;
@@ -2048,7 +2048,7 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card, 
	return 0;

	return 0;

}

}





static int __init cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)

static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)

{

{

	struct snd_card *card;

	struct snd_card *card;

	int err;

	int err;
@@ -2072,7 +2072,7 @@ static int __init cs4231_ebus_probe(struct of_device *op, const struct of_device 
}

}

#endif

#endif





static int __init cs4231_probe(struct of_device *op, const struct of_device_id *match)

static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)

{

{

#ifdef EBUS_SUPPORT

#ifdef EBUS_SUPPORT

	if (!strcmp(op->node->parent->name, "ebus"))

	if (!strcmp(op->node->parent->name, "ebus"))
@@ -2086,7 +2086,7 @@ static int __init cs4231_probe(struct of_device *op, const struct of_device_id * 
	return -ENODEV;

	return -ENODEV;

}

}





static int __exit cs4231_remove(struct of_device *op)

static int __devexit cs4231_remove(struct of_device *op)

{

{

	struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);

	struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
@@ -2112,7 +2112,7 @@ static struct of_platform_driver cs4231_driver = { 
	.name		= "audio",

	.name		= "audio",

	.match_table	= cs4231_match,

	.match_table	= cs4231_match,

	.probe		= cs4231_probe,

	.probe		= cs4231_probe,

	.remove		= __exit_p(cs4231_remove),

	.remove		= __devexit_p(cs4231_remove),

};

};





static int __init cs4231_init(void)

static int __init cs4231_init(void)