unsigned int len)
 {
        struct device *dev = to_dev(pmem);
-       sector_t sector;
-       long cleared;
+       sector_t sector, cleared;
 
        sector = (offset - pmem->data_offset) / 512;
-       cleared = nvdimm_clear_poison(dev, pmem->phys_addr + offset, len);
+       cleared = nvdimm_clear_poison(dev, pmem->phys_addr + offset, len) / 512;
 
-       if (cleared > 0 && cleared / 512) {
+       if (cleared) {
                dev_dbg(dev, "%s: %#llx clear %ld sector%s\n",
                                __func__, (unsigned long long) sector,
-                               cleared / 512, cleared / 512 > 1 ? "s" : "");
-               badblocks_clear(&pmem->bb, sector, cleared / 512);
+                               cleared, cleared > 1 ? "s" : "");
+               badblocks_clear(&pmem->bb, sector, cleared);
        }
        invalidate_pmem(pmem->virt_addr + offset, len);
 }