Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

[~andy/linux] / arch / powerpc / sysdev / fsl_85xx_l2ctlr.c

diff --git a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
index cc8d6556d7991cca14e303aaf0eee844dcb4adb6..5f88797dce73cecc191312a81b27b7f97b67043e 100644 (file)
--- a/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
+++ b/arch/powerpc/sysdev/fsl_85xx_l2ctlr.c
@@ -71,8 +71,7 @@ static int __init get_offset_from_cmdline(char *str)
 __setup("cache-sram-size=", get_size_from_cmdline);
 __setup("cache-sram-offset=", get_offset_from_cmdline);
 
-static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev,
-                                         const struct of_device_id *match)
+static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev)
 {
        long rval;
        unsigned int rem;
@@ -94,14 +93,14 @@ static int __devinit mpc85xx_l2ctlr_of_probe(struct platform_device *dev,
        l2cache_size = *prop;
 
        sram_params.sram_size  = get_cache_sram_size();
-       if (sram_params.sram_size <= 0) {
+       if ((int)sram_params.sram_size <= 0) {
                dev_err(&dev->dev,
                        "Entire L2 as cache, Aborting Cache-SRAM stuff\n");
                return -EINVAL;
        }
 
        sram_params.sram_offset  = get_cache_sram_offset();
-       if (sram_params.sram_offset <= 0) {
+       if ((int64_t)sram_params.sram_offset <= 0) {
                dev_err(&dev->dev,
                        "Entire L2 as cache, provide a valid sram offset\n");
                return -EINVAL;
@@ -204,7 +203,7 @@ static struct of_device_id mpc85xx_l2ctlr_of_match[] = {
        {},
 };
 
-static struct of_platform_driver mpc85xx_l2ctlr_of_platform_driver = {
+static struct platform_driver mpc85xx_l2ctlr_of_platform_driver = {
        .driver = {
                .name           = "fsl-l2ctlr",
                .owner          = THIS_MODULE,
@@ -216,12 +215,12 @@ static struct of_platform_driver mpc85xx_l2ctlr_of_platform_driver = {
 
 static __init int mpc85xx_l2ctlr_of_init(void)
 {
-       return of_register_platform_driver(&mpc85xx_l2ctlr_of_platform_driver);
+       return platform_driver_register(&mpc85xx_l2ctlr_of_platform_driver);
 }
 
 static void __exit mpc85xx_l2ctlr_of_exit(void)
 {
-       of_unregister_platform_driver(&mpc85xx_l2ctlr_of_platform_driver);
+       platform_driver_unregister(&mpc85xx_l2ctlr_of_platform_driver);
 }
 
 subsys_initcall(mpc85xx_l2ctlr_of_init);