if (attr->private)
                dev = attr->private;
        else
-               dev = container_of(kobj, struct device, kobj);
+               dev = kobj_to_dev(kobj);
        nvmem = to_nvmem_device(dev);
 
        /* Stop the user from reading */
        if (attr->private)
                dev = attr->private;
        else
-               dev = container_of(kobj, struct device, kobj);
+               dev = kobj_to_dev(kobj);
        nvmem = to_nvmem_device(dev);
 
        /* Stop the user from writing */
 static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
                                         struct bin_attribute *attr, int i)
 {
-       struct device *dev = container_of(kobj, struct device, kobj);
+       struct device *dev = kobj_to_dev(kobj);
        struct nvmem_device *nvmem = to_nvmem_device(dev);
 
        return nvmem_bin_attr_get_umode(nvmem);