Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / drivers / usb / host / oxu210hp-hcd.c

diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index d9c85a2..32149be 100644 (file)
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -544,8 +544,6 @@ static void oxu_buf_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd)
        qtd->buffer = NULL;
 
        spin_unlock(&oxu->mem_lock);
-
-       return;
 }
 
 static inline void ehci_qtd_init(struct ehci_qtd *qtd, dma_addr_t dma)
@@ -571,8 +569,6 @@ static inline void oxu_qtd_free(struct oxu_hcd *oxu, struct ehci_qtd *qtd)
        oxu->qtd_used[index] = 0;
 
        spin_unlock(&oxu->mem_lock);
-
-       return;
 }
 
 static struct ehci_qtd *ehci_qtd_alloc(struct oxu_hcd *oxu)
@@ -615,8 +611,6 @@ static void oxu_qh_free(struct oxu_hcd *oxu, struct ehci_qh *qh)
        oxu->qh_used[index] = 0;
 
        spin_unlock(&oxu->mem_lock);
-
-       return;
 }
 
 static void qh_destroy(struct kref *kref)
@@ -693,8 +687,6 @@ static void oxu_murb_free(struct oxu_hcd *oxu, struct oxu_murb *murb)
        oxu->murb_used[index] = 0;
 
        spin_unlock(&oxu->mem_lock);
-
-       return;
 }
 
 static struct oxu_murb *oxu_murb_alloc(struct oxu_hcd *oxu)
@@ -3070,7 +3062,6 @@ nogood:
        ep->hcpriv = NULL;
 done:
        spin_unlock_irqrestore(&oxu->lock, flags);
-       return;
 }
 
 static int oxu_get_frame(struct usb_hcd *hcd)
@@ -3696,7 +3687,7 @@ static void oxu_configuration(struct platform_device *pdev, void *base)
 static int oxu_verify_id(struct platform_device *pdev, void *base)
 {
        u32 id;
-       char *bo[] = {
+       static const char * const bo[] = {
                "reserved",
                "128-pin LQFP",
                "84-pin TFBGA",