|
@@ -327,7 +327,7 @@ static void cm109_submit_buzz_toggle(struct cm109_dev *dev)
|
|
|
|
|
|
error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
|
|
|
if (error)
|
|
|
- dev_err(&dev->idev->dev,
|
|
|
+ dev_err(&dev->intf->dev,
|
|
|
"%s: usb_submit_urb (urb_ctl) failed %d\n",
|
|
|
__func__, error);
|
|
|
}
|
|
@@ -341,7 +341,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
|
|
|
const int status = urb->status;
|
|
|
int error;
|
|
|
|
|
|
- dev_dbg(&urb->dev->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
|
|
|
+ dev_dbg(&dev->intf->dev, "### URB IRQ: [0x%02x 0x%02x 0x%02x 0x%02x] keybit=0x%02x\n",
|
|
|
dev->irq_data->byte[0],
|
|
|
dev->irq_data->byte[1],
|
|
|
dev->irq_data->byte[2],
|
|
@@ -351,7 +351,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
|
|
|
if (status) {
|
|
|
if (status == -ESHUTDOWN)
|
|
|
return;
|
|
|
- dev_err(&dev->idev->dev, "%s: urb status %d\n", __func__, status);
|
|
|
+ dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status);
|
|
|
}
|
|
|
|
|
|
/* Special keys */
|
|
@@ -398,7 +398,7 @@ static void cm109_urb_irq_callback(struct urb *urb)
|
|
|
|
|
|
error = usb_submit_urb(dev->urb_ctl, GFP_ATOMIC);
|
|
|
if (error)
|
|
|
- dev_err(&dev->idev->dev,
|
|
|
+ dev_err(&dev->intf->dev,
|
|
|
"%s: usb_submit_urb (urb_ctl) failed %d\n",
|
|
|
__func__, error);
|
|
|
}
|
|
@@ -412,14 +412,14 @@ static void cm109_urb_ctl_callback(struct urb *urb)
|
|
|
const int status = urb->status;
|
|
|
int error;
|
|
|
|
|
|
- dev_dbg(&urb->dev->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
|
|
|
+ dev_dbg(&dev->intf->dev, "### URB CTL: [0x%02x 0x%02x 0x%02x 0x%02x]\n",
|
|
|
dev->ctl_data->byte[0],
|
|
|
dev->ctl_data->byte[1],
|
|
|
dev->ctl_data->byte[2],
|
|
|
dev->ctl_data->byte[3]);
|
|
|
|
|
|
if (status)
|
|
|
- dev_err(&dev->idev->dev, "%s: urb status %d\n", __func__, status);
|
|
|
+ dev_err(&dev->intf->dev, "%s: urb status %d\n", __func__, status);
|
|
|
|
|
|
spin_lock(&dev->ctl_submit_lock);
|
|
|
|
|
@@ -436,7 +436,7 @@ static void cm109_urb_ctl_callback(struct urb *urb)
|
|
|
dev->irq_urb_pending = 1;
|
|
|
error = usb_submit_urb(dev->urb_irq, GFP_ATOMIC);
|
|
|
if (error)
|
|
|
- dev_err(&dev->idev->dev,
|
|
|
+ dev_err(&dev->intf->dev,
|
|
|
"%s: usb_submit_urb (urb_irq) failed %d\n",
|
|
|
__func__, error);
|
|
|
}
|
|
@@ -480,7 +480,7 @@ static void cm109_toggle_buzzer_sync(struct cm109_dev *dev, int on)
|
|
|
dev->ctl_data,
|
|
|
USB_PKT_LEN, USB_CTRL_SET_TIMEOUT);
|
|
|
if (error < 0 && error != -EINTR)
|
|
|
- dev_err(&dev->idev->dev, "%s: usb_control_msg() failed %d\n",
|
|
|
+ dev_err(&dev->intf->dev, "%s: usb_control_msg() failed %d\n",
|
|
|
__func__, error);
|
|
|
}
|
|
|
|
|
@@ -542,7 +542,7 @@ static int cm109_input_open(struct input_dev *idev)
|
|
|
|
|
|
error = usb_submit_urb(dev->urb_ctl, GFP_KERNEL);
|
|
|
if (error)
|
|
|
- dev_err(&idev->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n",
|
|
|
+ dev_err(&dev->intf->dev, "%s: usb_submit_urb (urb_ctl) failed %d\n",
|
|
|
__func__, error);
|
|
|
else
|
|
|
dev->open = 1;
|
|
@@ -579,7 +579,7 @@ static int cm109_input_ev(struct input_dev *idev, unsigned int type,
|
|
|
{
|
|
|
struct cm109_dev *dev = input_get_drvdata(idev);
|
|
|
|
|
|
- dev_dbg(&dev->udev->dev,
|
|
|
+ dev_dbg(&dev->intf->dev,
|
|
|
"input_ev: type=%u code=%u value=%d\n", type, code, value);
|
|
|
|
|
|
if (type != EV_SND)
|