struct delayed_work *delayed_work;
        int battery_ret;
 
-       delayed_work = container_of(work, struct delayed_work, work);
+       delayed_work = to_delayed_work(work);
        drvdata = container_of(delayed_work, struct corsair_void_drvdata,
                               delayed_status_work);
 
        struct delayed_work *delayed_work;
        int firmware_ret;
 
-       delayed_work = container_of(work, struct delayed_work, work);
+       delayed_work = to_delayed_work(work);
        drvdata = container_of(delayed_work, struct corsair_void_drvdata,
                               delayed_firmware_work);