* though so it's not too big a deal
         */
        if (dev->data.pos >= dev->data.len) {
-               dev_dbg(&dev->udev->dev,
+               dev_dbg(&dev->interface->dev,
                        "%s - Error ran out of data. pos: %d, len: %d\n",
                        __func__, dev->data.pos, dev->data.len);
                return -1;
                                remote->data.tester = remote->data.tester >> 6;
                                remote->data.bits_left -= 6;
                        } else {
-                               dev_err(&remote->input->dev,
+                               dev_err(&remote->interface->dev,
                                        "%s - Unknown sequence found in system data.\n",
                                        __func__);
                                remote->stage = 0;
                                remote->data.tester = remote->data.tester >> 6;
                                remote->data.bits_left -= 6;
                        } else {
-                               dev_err(&remote->input->dev,
+                               dev_err(&remote->interface->dev,
                                        "%s - Unknown sequence found in button data.\n",
                                        __func__);
                                remote->stage = 0;
                        remote->data.tester = remote->data.tester >> 6;
                        remote->data.bits_left -= 6;
                } else {
-                       dev_err(&remote->input->dev,
+                       dev_err(&remote->interface->dev,
                                "%s - Error in message, invalid toggle.\n",
                                __func__);
                        remote->stage = 0;
                        remote->data.tester = remote->data.tester >> 5;
                        remote->data.bits_left -= 5;
                } else {
-                       dev_err(&remote->input->dev,
+                       dev_err(&remote->interface->dev,
                                "Bad message received, no stop bit found.\n");
                }
 
-               dev_dbg(&remote->udev->dev,
+               dev_dbg(&remote->interface->dev,
                        "%s found valid message: system: %d, button: %d, toggle: %d\n",
                        __func__, message.system, message.button, message.toggle);
 
 resubmit:
        retval = usb_submit_urb(urb, GFP_ATOMIC);
        if (retval)
-               dev_err(&dev->input->dev,
+               dev_err(&dev->interface->dev,
                        "%s - usb_submit_urb failed with result: %d\n",
                        __func__, retval);
 }