Merge tag 'platform-drivers-x86-v4.10-2' of git://git.infradead.org/users/dvhart...

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

diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
index 4b5cd3a7b2b646b31a54e29eeb43661acf65e7a6..12046f4f00e4ce3fe19eb582168df37f4d2eb1f8 100644 (file)
--- a/drivers/block/zram/zcomp.c
+++ b/drivers/block/zram/zcomp.c
@@ -160,82 +160,56 @@ int zcomp_decompress(struct zcomp_strm *zstrm,
                        dst, &dst_len);
 }
 
-static int __zcomp_cpu_notifier(struct zcomp *comp,
-               unsigned long action, unsigned long cpu)
+int zcomp_cpu_up_prepare(unsigned int cpu, struct hlist_node *node)
 {
+       struct zcomp *comp = hlist_entry(node, struct zcomp, node);
        struct zcomp_strm *zstrm;
 
-       switch (action) {
-       case CPU_UP_PREPARE:
-               if (WARN_ON(*per_cpu_ptr(comp->stream, cpu)))
-                       break;
-               zstrm = zcomp_strm_alloc(comp);
-               if (IS_ERR_OR_NULL(zstrm)) {
-                       pr_err("Can't allocate a compression stream\n");
-                       return NOTIFY_BAD;
-               }
-               *per_cpu_ptr(comp->stream, cpu) = zstrm;
-               break;
-       case CPU_DEAD:
-       case CPU_UP_CANCELED:
-               zstrm = *per_cpu_ptr(comp->stream, cpu);
-               if (!IS_ERR_OR_NULL(zstrm))
-                       zcomp_strm_free(zstrm);
-               *per_cpu_ptr(comp->stream, cpu) = NULL;
-               break;
-       default:
-               break;
+       if (WARN_ON(*per_cpu_ptr(comp->stream, cpu)))
+               return 0;
+
+       zstrm = zcomp_strm_alloc(comp);
+       if (IS_ERR_OR_NULL(zstrm)) {
+               pr_err("Can't allocate a compression stream\n");
+               return -ENOMEM;
        }
-       return NOTIFY_OK;
+       *per_cpu_ptr(comp->stream, cpu) = zstrm;
+       return 0;
 }
 
-static int zcomp_cpu_notifier(struct notifier_block *nb,
-               unsigned long action, void *pcpu)
+int zcomp_cpu_dead(unsigned int cpu, struct hlist_node *node)
 {
-       unsigned long cpu = (unsigned long)pcpu;
-       struct zcomp *comp = container_of(nb, typeof(*comp), notifier);
+       struct zcomp *comp = hlist_entry(node, struct zcomp, node);
+       struct zcomp_strm *zstrm;
 
-       return __zcomp_cpu_notifier(comp, action, cpu);
+       zstrm = *per_cpu_ptr(comp->stream, cpu);
+       if (!IS_ERR_OR_NULL(zstrm))
+               zcomp_strm_free(zstrm);
+       *per_cpu_ptr(comp->stream, cpu) = NULL;
+       return 0;
 }
 
 static int zcomp_init(struct zcomp *comp)
 {
-       unsigned long cpu;
        int ret;
 
-       comp->notifier.notifier_call = zcomp_cpu_notifier;
-
        comp->stream = alloc_percpu(struct zcomp_strm *);
        if (!comp->stream)
                return -ENOMEM;
 
-       cpu_notifier_register_begin();
-       for_each_online_cpu(cpu) {
-               ret = __zcomp_cpu_notifier(comp, CPU_UP_PREPARE, cpu);
-               if (ret == NOTIFY_BAD)
-                       goto cleanup;
-       }
-       __register_cpu_notifier(&comp->notifier);
-       cpu_notifier_register_done();
+       ret = cpuhp_state_add_instance(CPUHP_ZCOMP_PREPARE, &comp->node);
+       if (ret < 0)
+               goto cleanup;
        return 0;
 
 cleanup:
-       for_each_online_cpu(cpu)
-               __zcomp_cpu_notifier(comp, CPU_UP_CANCELED, cpu);
-       cpu_notifier_register_done();
-       return -ENOMEM;
+       free_percpu(comp->stream);
+       return ret;
 }
 
 void zcomp_destroy(struct zcomp *comp)
 {
-       unsigned long cpu;
-
-       cpu_notifier_register_begin();
-       for_each_online_cpu(cpu)
-               __zcomp_cpu_notifier(comp, CPU_UP_CANCELED, cpu);
-       __unregister_cpu_notifier(&comp->notifier);
-       cpu_notifier_register_done();
-
+       cpuhp_state_remove_instance(CPUHP_ZCOMP_PREPARE, &comp->node);
        free_percpu(comp->stream);
        kfree(comp);
 }