aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/mouse')
-rw-r--r--drivers/input/mouse/bcm5974.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index e32928ee7cc2..2cf681d98c0d 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -584,7 +584,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
584 int retval = 0, size; 584 int retval = 0, size;
585 585
586 if (!data) { 586 if (!data) {
587 dev_err(&dev->input->dev, "out of memory\n"); 587 dev_err(&dev->intf->dev, "out of memory\n");
588 retval = -ENOMEM; 588 retval = -ENOMEM;
589 goto out; 589 goto out;
590 } 590 }
@@ -597,7 +597,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
597 BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000); 597 BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
598 598
599 if (size != 8) { 599 if (size != 8) {
600 dev_err(&dev->input->dev, "could not read from device\n"); 600 dev_err(&dev->intf->dev, "could not read from device\n");
601 retval = -EIO; 601 retval = -EIO;
602 goto out; 602 goto out;
603 } 603 }
@@ -615,7 +615,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
615 BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000); 615 BCM5974_WELLSPRING_MODE_REQUEST_INDEX, data, 8, 5000);
616 616
617 if (size != 8) { 617 if (size != 8) {
618 dev_err(&dev->input->dev, "could not write to device\n"); 618 dev_err(&dev->intf->dev, "could not write to device\n");
619 retval = -EIO; 619 retval = -EIO;
620 goto out; 620 goto out;
621 } 621 }
@@ -631,7 +631,7 @@ static int bcm5974_wellspring_mode(struct bcm5974 *dev, bool on)
631static void bcm5974_irq_button(struct urb *urb) 631static void bcm5974_irq_button(struct urb *urb)
632{ 632{
633 struct bcm5974 *dev = urb->context; 633 struct bcm5974 *dev = urb->context;
634 struct input_dev *idev = dev->input; 634 struct usb_interface *intf = dev->intf;
635 int error; 635 int error;
636 636
637 switch (urb->status) { 637 switch (urb->status) {
@@ -641,11 +641,11 @@ static void bcm5974_irq_button(struct urb *urb)
641 case -ECONNRESET: 641 case -ECONNRESET:
642 case -ENOENT: 642 case -ENOENT:
643 case -ESHUTDOWN: 643 case -ESHUTDOWN:
644 dev_dbg(&idev->dev, "button urb shutting down: %d\n", 644 dev_dbg(&intf->dev, "button urb shutting down: %d\n",
645 urb->status); 645 urb->status);
646 return; 646 return;
647 default: 647 default:
648 dev_dbg(&idev->dev, "button urb status: %d\n", urb->status); 648 dev_dbg(&intf->dev, "button urb status: %d\n", urb->status);
649 goto exit; 649 goto exit;
650 } 650 }
651 651
@@ -656,13 +656,13 @@ static void bcm5974_irq_button(struct urb *urb)
656exit: 656exit:
657 error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC); 657 error = usb_submit_urb(dev->bt_urb, GFP_ATOMIC);
658 if (error) 658 if (error)
659 dev_err(&idev->dev, "button urb failed: %d\n", error); 659 dev_err(&intf->dev, "button urb failed: %d\n", error);
660} 660}
661 661
662static void bcm5974_irq_trackpad(struct urb *urb) 662static void bcm5974_irq_trackpad(struct urb *urb)
663{ 663{
664 struct bcm5974 *dev = urb->context; 664 struct bcm5974 *dev = urb->context;
665 struct input_dev *idev = dev->input; 665 struct usb_interface *intf = dev->intf;
666 int error; 666 int error;
667 667
668 switch (urb->status) { 668 switch (urb->status) {
@@ -672,11 +672,11 @@ static void bcm5974_irq_trackpad(struct urb *urb)
672 case -ECONNRESET: 672 case -ECONNRESET:
673 case -ENOENT: 673 case -ENOENT:
674 case -ESHUTDOWN: 674 case -ESHUTDOWN:
675 dev_dbg(&idev->dev, "trackpad urb shutting down: %d\n", 675 dev_dbg(&intf->dev, "trackpad urb shutting down: %d\n",
676 urb->status); 676 urb->status);
677 return; 677 return;
678 default: 678 default:
679 dev_dbg(&idev->dev, "trackpad urb status: %d\n", urb->status); 679 dev_dbg(&intf->dev, "trackpad urb status: %d\n", urb->status);
680 goto exit; 680 goto exit;
681 } 681 }
682 682
@@ -691,7 +691,7 @@ static void bcm5974_irq_trackpad(struct urb *urb)
691exit: 691exit:
692 error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC); 692 error = usb_submit_urb(dev->tp_urb, GFP_ATOMIC);
693 if (error) 693 if (error)
694 dev_err(&idev->dev, "trackpad urb failed: %d\n", error); 694 dev_err(&intf->dev, "trackpad urb failed: %d\n", error);
695} 695}
696 696
697/* 697/*