1 files changed, 9 insertions, 21 deletions

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index e4e59b4de25d..c090a7e3ecf8 100644
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -11,16 +11,6 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
  */
 
 /* #define VERBOSE_DEBUG */
@@ -232,8 +222,7 @@ static int pxa25x_ep_enable (struct usb_ep *_ep,
         if (!_ep || !desc || ep->desc || _ep->name == ep0name
                         || desc->bDescriptorType != USB_DT_ENDPOINT
                         || ep->bEndpointAddress != desc->bEndpointAddress
-                        || ep->fifo_size < le16_to_cpu
-                                                (desc->wMaxPacketSize)) {
+                        || ep->fifo_size < usb_endpoint_maxp (desc)) {
                 DMSG("%s, bad ep or descriptor\n", __func__);
                 return -EINVAL;
         }
@@ -248,7 +237,7 @@ static int pxa25x_ep_enable (struct usb_ep *_ep,
 
         /* hardware _could_ do smaller, but driver doesn't */
         if ((desc->bmAttributes == USB_ENDPOINT_XFER_BULK
-                                && le16_to_cpu (desc->wMaxPacketSize)
+                                && usb_endpoint_maxp (desc)
                                                 != BULK_FIFO_SIZE)
                         || !desc->wMaxPacketSize) {
                 DMSG("%s, bad %s maxpacket\n", __func__, _ep->name);
@@ -264,7 +253,7 @@ static int pxa25x_ep_enable (struct usb_ep *_ep,
         ep->desc = desc;
         ep->stopped = 0;
         ep->pio_irqs = 0;
-        ep->ep.maxpacket = le16_to_cpu (desc->wMaxPacketSize);
+        ep->ep.maxpacket = usb_endpoint_maxp (desc);
 
         /* flush fifo (mostly for OUT buffers) */
         pxa25x_ep_fifo_flush (_ep);
@@ -401,7 +390,7 @@ write_fifo (struct pxa25x_ep *ep, struct pxa25x_request *req)
 {
         unsigned                max;
 
-        max = le16_to_cpu(ep->desc->wMaxPacketSize);
+        max = usb_endpoint_maxp(ep->desc);
         do {
                 unsigned        count;
                 int             is_last, is_short;
@@ -671,8 +660,7 @@ pxa25x_ep_queue(struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
          * we can report per-packet status.  that also helps with dma.
          */
         if (unlikely (ep->bmAttributes == USB_ENDPOINT_XFER_ISOC
-                        && req->req.length > le16_to_cpu
-                                                (ep->desc->wMaxPacketSize)))
+                        && req->req.length > usb_endpoint_maxp (ep->desc)))
                 return -EMSGSIZE;
 
         DBG(DBG_NOISY, "%s queue req %p, len %d buf %p\n",
@@ -1105,7 +1093,7 @@ udc_seq_show(struct seq_file *m, void *_d)
                         tmp = *dev->ep [i].reg_udccs;
                         seq_printf(m,
                                 "%s max %d %s udccs %02x irqs %lu\n",
-                                ep->ep.name, le16_to_cpu(desc->wMaxPacketSize),
+                                ep->ep.name, usb_endpoint_maxp(desc),
                                 "pio", tmp, ep->pio_irqs);
                         /* TODO translate all five groups of udccs bits! */
 
@@ -2202,7 +2190,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
 
         /* irq setup after old hardware state is cleaned up */
         retval = request_irq(irq, pxa25x_udc_irq,
-                        IRQF_DISABLED, driver_name, dev);
+                        0, driver_name, dev);
         if (retval != 0) {
                 pr_err("%s: can't get irq %d, err %d\n",
                         driver_name, irq, retval);
@@ -2214,7 +2202,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
         if (machine_is_lubbock()) {
                 retval = request_irq(LUBBOCK_USB_DISC_IRQ,
                                 lubbock_vbus_irq,
-                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
+                                IRQF_SAMPLE_RANDOM,
                                 driver_name, dev);
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",
@@ -2223,7 +2211,7 @@ static int __init pxa25x_udc_probe(struct platform_device *pdev)
                 }
                 retval = request_irq(LUBBOCK_USB_IRQ,
                                 lubbock_vbus_irq,
-                                IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
+                                IRQF_SAMPLE_RANDOM,
                                 driver_name, dev);
                 if (retval != 0) {
                         pr_err("%s: can't get irq %i, err %d\n",