Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[pandora-kernel.git] / arch / sh / kernel / cpu / sh4 / sq.c

diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
index c21512c..3008c00 100644 (file)
--- a/arch/sh/kernel/cpu/sh4/sq.c
+++ b/arch/sh/kernel/cpu/sh4/sq.c
@@ -58,11 +58,11 @@ do {                                                \
  */
 void sq_flush_range(unsigned long start, unsigned int len)
 {
-       volatile unsigned long *sq = (unsigned long *)start;
+       unsigned long *sq = (unsigned long *)start;
 
        /* Flush the queues */
        for (len >>= 5; len--; sq += 8)
-               prefetchw((void *)sq);
+               prefetchw(sq);
 
        /* Wait for completion */
        store_queue_barrier();
@@ -341,17 +341,18 @@ static int __devinit sq_sysdev_add(struct sys_device *sysdev)
 {
        unsigned int cpu = sysdev->id;
        struct kobject *kobj;
+       int error;
 
        sq_kobject[cpu] = kzalloc(sizeof(struct kobject), GFP_KERNEL);
        if (unlikely(!sq_kobject[cpu]))
                return -ENOMEM;
 
        kobj = sq_kobject[cpu];
-       kobj->parent = &sysdev->kobj;
-       kobject_set_name(kobj, "%s", "sq");
-       kobj->ktype = &ktype_percpu_entry;
-
-       return kobject_register(kobj);
+       error = kobject_init_and_add(kobj, &ktype_percpu_entry, &sysdev->kobj,
+                                    "%s", "sq");
+       if (!error)
+               kobject_uevent(kobj, KOBJ_ADD);
+       return error;
 }
 
 static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
@@ -359,7 +360,7 @@ static int __devexit sq_sysdev_remove(struct sys_device *sysdev)
        unsigned int cpu = sysdev->id;
        struct kobject *kobj = sq_kobject[cpu];
 
-       kobject_unregister(kobj);
+       kobject_put(kobj);
        return 0;
 }