if (rc < 0)
                return rc;
 
-       resize_hpt_debug(resize, "resize_hpt_allocate(): HPT @ 0x%lx\n",
+       resize_hpt_debug(resize, "%s(): HPT @ 0x%lx\n", __func__,
                         resize->hpt.virt);
 
        return 0;
                 */
                mutex_unlock(&kvm->arch.mmu_setup_lock);
 
-               resize_hpt_debug(resize, "resize_hpt_prepare_work(): order = %d\n",
+               resize_hpt_debug(resize, "%s(): order = %d\n", __func__,
                                 resize->order);
 
                err = resize_hpt_allocate(resize);
                        ret = kvmppc_virtmode_do_h_enter(kvm, H_EXACT, i, v, r,
                                                         tmp);
                        if (ret != H_SUCCESS) {
-                               pr_err("kvm_htab_write ret %ld i=%ld v=%lx "
-                                      "r=%lx\n", ret, i, v, r);
+                               pr_err("%s ret %ld i=%ld v=%lx r=%lx\n", __func__, ret, i, v, r);
                                goto out;
                        }
                        if (!mmu_ready && is_vrma_hpte(v)) {