]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: dwc2: Fix lines over 80 characters
authorJohn Youn <John.Youn@synopsys.com>
Wed, 18 Jan 2017 04:31:58 +0000 (20:31 -0800)
committerFelipe Balbi <felipe.balbi@linux.intel.com>
Tue, 24 Jan 2017 09:04:20 +0000 (11:04 +0200)
Fix lines over 80 characters.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
drivers/usb/dwc2/core.h
drivers/usb/dwc2/gadget.c
drivers/usb/dwc2/hcd.c
drivers/usb/dwc2/hcd_intr.c
drivers/usb/dwc2/params.c

index ef67f268d3daf1ff62232b3c9091c068d0390fe6..2fdd74d502c01019bfc84d4b721ff859e8e08dac 100644 (file)
@@ -127,6 +127,8 @@ static const char * const dwc2_hsotg_supply_names[] = {
        "vusb_a",               /* analog USB supply, 1.1V */
 };
 
+#define DWC2_NUM_SUPPLIES ARRAY_SIZE(dwc2_hsotg_supply_names)
+
 /*
  * EP0_MPS_LIMIT
  *
@@ -246,7 +248,8 @@ struct dwc2_hsotg_req {
        void *saved_req_buf;
 };
 
-#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
+#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \
+       IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
 #define call_gadget(_hs, _entry) \
 do { \
        if ((_hs)->gadget.speed != USB_SPEED_UNKNOWN && \
@@ -922,7 +925,7 @@ struct dwc2_hsotg {
        struct phy *phy;
        struct usb_phy *uphy;
        struct dwc2_hsotg_plat *plat;
-       struct regulator_bulk_data supplies[ARRAY_SIZE(dwc2_hsotg_supply_names)];
+       struct regulator_bulk_data supplies[DWC2_NUM_SUPPLIES];
        u32 phyif;
 
        spinlock_t lock;
@@ -1034,7 +1037,8 @@ struct dwc2_hsotg {
 #endif
 #endif /* CONFIG_USB_DWC2_HOST || CONFIG_USB_DWC2_DUAL_ROLE */
 
-#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
+#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \
+       IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
        /* Gadget structures */
        struct usb_gadget_driver *driver;
        int fifo_mem;
@@ -1177,7 +1181,8 @@ void dwc2_dump_global_registers(struct dwc2_hsotg *hsotg);
 u16 dwc2_get_otg_version(struct dwc2_hsotg *hsotg);
 
 /* Gadget defines */
-#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
+#if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \
+       IS_ENABLED(CONFIG_USB_DWC2_DUAL_ROLE)
 int dwc2_hsotg_remove(struct dwc2_hsotg *hsotg);
 int dwc2_hsotg_suspend(struct dwc2_hsotg *dwc2);
 int dwc2_hsotg_resume(struct dwc2_hsotg *dwc2);
index 3190ffc439804ae5aa8e9a37695278c50076463d..651e9a38a654e5e0ea3d469b4dd850b7348998d5 100644 (file)
@@ -1113,7 +1113,8 @@ dma_error:
 }
 
 static int dwc2_hsotg_handle_unaligned_buf_start(struct dwc2_hsotg *hsotg,
-                                                struct dwc2_hsotg_ep *hs_ep, struct dwc2_hsotg_req *hs_req)
+                                                struct dwc2_hsotg_ep *hs_ep,
+                                                struct dwc2_hsotg_req *hs_req)
 {
        void *req_buf = hs_req->req.buf;
 
@@ -1143,8 +1144,10 @@ static int dwc2_hsotg_handle_unaligned_buf_start(struct dwc2_hsotg *hsotg,
        return 0;
 }
 
-static void dwc2_hsotg_handle_unaligned_buf_complete(struct dwc2_hsotg *hsotg,
-                                                    struct dwc2_hsotg_ep *hs_ep, struct dwc2_hsotg_req *hs_req)
+static void
+dwc2_hsotg_handle_unaligned_buf_complete(struct dwc2_hsotg *hsotg,
+                                        struct dwc2_hsotg_ep *hs_ep,
+                                        struct dwc2_hsotg_req *hs_req)
 {
        /* If dma is not being used or buffer was aligned */
        if (!using_dma(hsotg) || !hs_req->saved_req_buf)
@@ -4449,8 +4452,9 @@ static int dwc2_hsotg_hw_cfg(struct dwc2_hsotg *hsotg)
        /* Add ep0 */
        hsotg->num_of_eps++;
 
-       hsotg->eps_in[0] = devm_kzalloc(hsotg->dev, sizeof(struct dwc2_hsotg_ep),
-                                                               GFP_KERNEL);
+       hsotg->eps_in[0] = devm_kzalloc(hsotg->dev,
+                                       sizeof(struct dwc2_hsotg_ep),
+                                       GFP_KERNEL);
        if (!hsotg->eps_in[0])
                return -ENOMEM;
        /* Same dwc2_hsotg_ep is used in both directions for ep0 */
index 5ad95282fd4d8faa929f7d55195bd2242ea550e6..2c90b0867ee16fb315cb4aa892cde7a1c20c268f 100644 (file)
@@ -4236,7 +4236,7 @@ void dwc2_host_complete(struct dwc2_hsotg *hsotg, struct dwc2_qtd *qtd,
 
                if (ep)
                        dwc2_free_bus_bandwidth(dwc2_hsotg_to_hcd(hsotg),
-                                               dwc2_hcd_get_ep_bandwidth(hsotg, ep),
+                                       dwc2_hcd_get_ep_bandwidth(hsotg, ep),
                                        urb);
        }
 
@@ -4682,7 +4682,7 @@ static int _dwc2_hcd_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
 
        if (alloc_bandwidth) {
                dwc2_allocate_bus_bandwidth(hcd,
-                                           dwc2_hcd_get_ep_bandwidth(hsotg, ep),
+                               dwc2_hcd_get_ep_bandwidth(hsotg, ep),
                                urb);
        }
 
index dfeff3cff3ebb9085c56002911c50fb843ead782..02afb6effd5ea0bbe05b6d6b3d0558be7ac8d67e 100644 (file)
@@ -1078,7 +1078,8 @@ static void dwc2_hc_xfercomp_intr(struct dwc2_hsotg *hsotg,
                        dev_vdbg(hsotg->dev, "  Isochronous transfer complete\n");
                if (qtd->isoc_split_pos == DWC2_HCSPLT_XACTPOS_ALL)
                        halt_status = dwc2_update_isoc_urb_state(hsotg, chan,
-                                                                chnum, qtd, DWC2_HC_XFER_COMPLETE);
+                                                       chnum, qtd,
+                                                       DWC2_HC_XFER_COMPLETE);
                dwc2_complete_periodic_xfer(hsotg, chan, chnum, qtd,
                                            halt_status);
                break;
@@ -1369,7 +1370,7 @@ static void dwc2_hc_nyet_intr(struct dwc2_hsotg *hsotg,
                                                     DWC2_HC_XFER_URB_COMPLETE);
                        } else {
                                dwc2_release_channel(hsotg, chan, qtd,
-                                                    DWC2_HC_XFER_NO_HALT_STATUS);
+                                               DWC2_HC_XFER_NO_HALT_STATUS);
                        }
                        goto handle_nyet_done;
                }
@@ -1490,7 +1491,7 @@ static void dwc2_hc_babble_intr(struct dwc2_hsotg *hsotg,
                enum dwc2_halt_status halt_status;
 
                halt_status = dwc2_update_isoc_urb_state(hsotg, chan, chnum,
-                                                        qtd, DWC2_HC_XFER_BABBLE_ERR);
+                                               qtd, DWC2_HC_XFER_BABBLE_ERR);
                dwc2_halt_channel(hsotg, chan, qtd, halt_status);
        }
 
@@ -1649,7 +1650,7 @@ static void dwc2_hc_xacterr_intr(struct dwc2_hsotg *hsotg,
                        enum dwc2_halt_status halt_status;
 
                        halt_status = dwc2_update_isoc_urb_state(hsotg, chan,
-                                                                chnum, qtd, DWC2_HC_XFER_XACT_ERR);
+                                        chnum, qtd, DWC2_HC_XFER_XACT_ERR);
                        dwc2_halt_channel(hsotg, chan, qtd, halt_status);
                }
                break;
@@ -1684,7 +1685,7 @@ static void dwc2_hc_frmovrun_intr(struct dwc2_hsotg *hsotg,
                break;
        case USB_ENDPOINT_XFER_ISOC:
                halt_status = dwc2_update_isoc_urb_state(hsotg, chan, chnum,
-                                                        qtd, DWC2_HC_XFER_FRAME_OVERRUN);
+                                       qtd, DWC2_HC_XFER_FRAME_OVERRUN);
                dwc2_halt_channel(hsotg, chan, qtd, halt_status);
                break;
        }
@@ -1910,7 +1911,7 @@ static void dwc2_hc_chhltd_intr_dma(struct dwc2_hsotg *hsotg,
                                        "%s: Halt channel %d (assume incomplete periodic transfer)\n",
                                        __func__, chnum);
                                dwc2_halt_channel(hsotg, chan, qtd,
-                                                 DWC2_HC_XFER_PERIODIC_INCOMPLETE);
+                                       DWC2_HC_XFER_PERIODIC_INCOMPLETE);
                        } else {
                                dev_err(hsotg->dev,
                                        "%s: Channel %d - ChHltd set, but reason is unknown\n",
index 1efabdc24f6447fcec4504e9435ae238bc0c932b..bcd1e19b40768679a0cee673be38587c8fdd11b0 100644 (file)
@@ -1131,27 +1131,27 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
        dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
 
        dwc2_set_param_host_support_fs_ls_low_power(hsotg,
-                                                   params->host_support_fs_ls_low_power);
+                       params->host_support_fs_ls_low_power);
        dwc2_set_param_enable_dynamic_fifo(hsotg,
-                                          params->enable_dynamic_fifo);
+                       params->enable_dynamic_fifo);
        dwc2_set_param_max_transfer_size(hsotg,
-                                        params->max_transfer_size);
+                       params->max_transfer_size);
        dwc2_set_param_max_packet_count(hsotg,
-                                       params->max_packet_count);
+                       params->max_packet_count);
        dwc2_set_param_host_channels(hsotg, params->host_channels);
        dwc2_set_param_phy_type(hsotg, params->phy_type);
        dwc2_set_param_speed(hsotg, params->speed);
        dwc2_set_param_host_ls_low_power_phy_clk(hsotg,
-                                                params->host_ls_low_power_phy_clk);
+                       params->host_ls_low_power_phy_clk);
        dwc2_set_param_phy_ulpi_ddr(hsotg, params->phy_ulpi_ddr);
        dwc2_set_param_phy_ulpi_ext_vbus(hsotg,
-                                        params->phy_ulpi_ext_vbus);
+                       params->phy_ulpi_ext_vbus);
        dwc2_set_param_phy_utmi_width(hsotg, params->phy_utmi_width);
        dwc2_set_param_ulpi_fs_ls(hsotg, params->ulpi_fs_ls);
        dwc2_set_param_ts_dline(hsotg, params->ts_dline);
        dwc2_set_param_i2c_enable(hsotg, params->i2c_enable);
        dwc2_set_param_en_multiple_tx_fifo(hsotg,
-                                          params->en_multiple_tx_fifo);
+                       params->en_multiple_tx_fifo);
        dwc2_set_param_reload_ctl(hsotg, params->reload_ctl);
        dwc2_set_param_ahbcfg(hsotg, params->ahbcfg);
        dwc2_set_param_otg_ver(hsotg, params->otg_ver);