lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dt/sound: Eliminate users of of_platform_{,un}register_driver

Browse Source 
Get rid of users of of_platform_driver in drivers/sound.  The
of_platform_{,un}register_driver functions are going away, so the
users need to be converted to using the platform_bus_type directly.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Grant Likely
2011-02-22 21:05:04 -07:00
parent 18d306d137
commit f07eb223a0
8 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sound/sparc/cs4231.c
View File

@@ -1856,7 +1856,7 @@ static int __devinit snd_cs4231_sbus_create(struct snd_card *card,
return 0;
}
static int __devinit cs4231_sbus_probe(struct platform_device *op, const struct of_device_id *match)
static int __devinit cs4231_sbus_probe(struct platform_device *op)
{
struct resource *rp = &op->resource[0];
struct snd_card *card;
@@ -2048,7 +2048,7 @@ static int __devinit snd_cs4231_ebus_create(struct snd_card *card,
return 0;
}
static int __devinit cs4231_ebus_probe(struct platform_device *op, const struct of_device_id *match)
static int __devinit cs4231_ebus_probe(struct platform_device *op)
{
struct snd_card *card;
int err;
@@ -2072,16 +2072,16 @@ static int __devinit cs4231_ebus_probe(struct platform_device *op, const struct
}
#endif
static int __devinit cs4231_probe(struct platform_device *op, const struct of_device_id *match)
static int __devinit cs4231_probe(struct platform_device *op)
{
#ifdef EBUS_SUPPORT
if (!strcmp(op->dev.of_node->parent->name, "ebus"))
return cs4231_ebus_probe(op, match);
return cs4231_ebus_probe(op);
#endif
#ifdef SBUS_SUPPORT
if (!strcmp(op->dev.of_node->parent->name, "sbus") ||
!strcmp(op->dev.of_node->parent->name, "sbi"))
return cs4231_sbus_probe(op, match);
return cs4231_sbus_probe(op);
#endif
return -ENODEV;
}
@@ -2108,7 +2108,7 @@ static const struct of_device_id cs4231_match[] = {
MODULE_DEVICE_TABLE(of, cs4231_match);
static struct of_platform_driver cs4231_driver = {
static struct platform_driver cs4231_driver = {
.driver = {
.name = "audio",
.owner = THIS_MODULE,
@@ -2120,12 +2120,12 @@ static struct of_platform_driver cs4231_driver = {
static int __init cs4231_init(void)
{
return of_register_platform_driver(&cs4231_driver);
return platform_driver_register(&cs4231_driver);
}
static void __exit cs4231_exit(void)
{
of_unregister_platform_driver(&cs4231_driver);
platform_driver_unregister(&cs4231_driver);
}
module_init(cs4231_init);