Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

[karo-tx-linux.git] / drivers / block / xsysace.c

diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 16a2fa96b810eb92856657f7b9e8fabec73e164f..73354b081ed3e8a629c849f3aaac865c1e1649e1 100644 (file)
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1196,16 +1196,13 @@ static struct platform_driver ace_platform_driver = {
  */
 
 #if defined(CONFIG_OF)
-static int __devinit
-ace_of_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit ace_of_probe(struct platform_device *op)
 {
        struct resource res;
        resource_size_t physaddr;
        const u32 *id;
        int irq, bus_width, rc;
 
-       dev_dbg(&op->dev, "ace_of_probe(%p, %p)\n", op, match);
-
        /* device id */
        id = of_get_property(op->dev.of_node, "port-number", NULL);
 
@@ -1246,7 +1243,7 @@ static const struct of_device_id ace_of_match[] __devinitconst = {
 };
 MODULE_DEVICE_TABLE(of, ace_of_match);
 
-static struct of_platform_driver ace_of_driver = {
+static struct platform_driver ace_of_driver = {
        .probe = ace_of_probe,
        .remove = __devexit_p(ace_of_remove),
        .driver = {
@@ -1260,12 +1257,12 @@ static struct of_platform_driver ace_of_driver = {
 static inline int __init ace_of_register(void)
 {
        pr_debug("xsysace: registering OF binding\n");
-       return of_register_platform_driver(&ace_of_driver);
+       return platform_driver_register(&ace_of_driver);
 }
 
 static inline void __exit ace_of_unregister(void)
 {
-       of_unregister_platform_driver(&ace_of_driver);
+       platform_driver_unregister(&ace_of_driver);
 }
 #else /* CONFIG_OF */
 /* CONFIG_OF not enabled; do nothing helpers */