Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (149 commits)
  USB: ohci-pnx4008: Remove unnecessary cast of return value of kzalloc
  USB: additions to the quirk list
  usb-storage: implement autosuspend
  USB: cdc-acm: add new device id to option driver
  USB: goku_udc trivial cleanups
  USB: usb gadget stack can now -DDEBUG with Kconfig
  usb gadget stack: remove usb_ep_*_buffer(), part 2
  usb gadget stack: remove usb_ep_*_buffer(), part 1
  USB: pxa2xx_udc -- cleanups, mostly removing dma hooks
  USB: pxa2xx_udc: use generic gpio layer
  USB: quirk for samsung printer
  USB: usb/dma doc updates
  USB: drivers/usb/storage/unusual_devs.h whitespace cleanup
  USB: remove Makefile reference to obsolete OHCI_AT91
  USB: io_*: remove bogus termios no change checks
  USB: mos7720: remove bogus no termios change check
  USB: visor and whiteheat: remove bogus termios change checks
  USB: pl2303: remove bogus checks and fix speed support to use tty_get_baud_rate()
  USB: mos7840.c: turn this into a serial driver
  USB: make the usb_device numa_node get assigned from controller
  ...

1 files changed, 3 insertions, 9 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 746a118a9b52..18c8b6c0db20 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1547,10 +1547,8 @@ static void ub_reset_enter(struct ub_dev *sc, int try)
 #endif
 
 #if 0 /* We let them stop themselves. */
-        struct list_head *p;
         struct ub_lun *lun;
-        list_for_each(p, &sc->luns) {
-                lun = list_entry(p, struct ub_lun, link);
+        list_for_each_entry(lun, &sc->luns, link) {
                 blk_stop_queue(lun->disk->queue);
         }
 #endif
@@ -1562,7 +1560,6 @@ static void ub_reset_task(struct work_struct *work)
 {
         struct ub_dev *sc = container_of(work, struct ub_dev, reset_work);
         unsigned long flags;
-        struct list_head *p;
         struct ub_lun *lun;
         int lkr, rc;
 
@@ -1608,8 +1605,7 @@ static void ub_reset_task(struct work_struct *work)
         spin_lock_irqsave(sc->lock, flags);
         sc->reset = 0;
         tasklet_schedule(&sc->tasklet);
-        list_for_each(p, &sc->luns) {
-                lun = list_entry(p, struct ub_lun, link);
+        list_for_each_entry(lun, &sc->luns, link) {
                 blk_start_queue(lun->disk->queue);
         }
         wake_up(&sc->reset_wait);
@@ -2348,7 +2344,6 @@ err_alloc:
 static void ub_disconnect(struct usb_interface *intf)
 {
         struct ub_dev *sc = usb_get_intfdata(intf);
-        struct list_head *p;
         struct ub_lun *lun;
         unsigned long flags;
 
@@ -2403,8 +2398,7 @@ static void ub_disconnect(struct usb_interface *intf)
         /*
          * Unregister the upper layer.
          */
-        list_for_each (p, &sc->luns) {
-                lun = list_entry(p, struct ub_lun, link);
+        list_for_each_entry(lun, &sc->luns, link) {
                 del_gendisk(lun->disk);
                 /*
                  * I wish I could do: