Rename this parameter for the same reason as "host_dma".
Signed-off-by: John Youn <johnyoun@xxxxxxxxxxxx>
---
drivers/usb/dwc2/core.h | 4 ++--
drivers/usb/dwc2/hcd.c | 8 ++++----
drivers/usb/dwc2/hcd_intr.c | 2 +-
drivers/usb/dwc2/params.c | 22 +++++++++++-----------
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index e47d3ea..ba26cb6 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -297,7 +297,7 @@ enum dwc2_ep0_state {
* value for this if none is specified.
* 0 - Address DMA
* 1 - Descriptor DMA (default, if available)
- * @dma_desc_fs_enable: When DMA mode is enabled, specifies whether to use
+ * @host_dma_desc_fs: When DMA mode is enabled, specifies whether to use
* address DMA mode or descriptor DMA mode for accessing
* the data FIFOs in Full Speed mode only. The driver
* will automatically detect the value for this if none is
@@ -453,7 +453,7 @@ struct dwc2_core_params {
int otg_ver;
int host_dma;
int host_dma_desc;
- int dma_desc_fs_enable;
+ int host_dma_desc_fs;
int speed;
#define DWC2_SPEED_PARAM_HIGH 0
#define DWC2_SPEED_PARAM_FULL 1
diff --git a/drivers/usb/dwc2/hcd.c b/drivers/usb/dwc2/hcd.c
index dac9aa5..1e0e267 100644
--- a/drivers/usb/dwc2/hcd.c
+++ b/drivers/usb/dwc2/hcd.c
@@ -3569,7 +3569,7 @@ static int dwc2_hcd_hub_control(struct dwc2_hsotg *hsotg, u16 typereq,
port_status |= USB_PORT_STAT_TEST;
/* USB_PORT_FEAT_INDICATOR unsupported always 0 */
- if (hsotg->params.dma_desc_fs_enable) {
+ if (hsotg->params.host_dma_desc_fs) {
/*
* Enable descriptor DMA only if a full speed
* device is connected.
@@ -5108,7 +5108,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
* Alignment must be set to 512 bytes.
*/
if (hsotg->params.host_dma_desc ||
- hsotg->params.dma_desc_fs_enable) {
+ hsotg->params.host_dma_desc_fs) {
hsotg->desc_gen_cache = kmem_cache_create("dwc2-gen-desc",
sizeof(struct dwc2_hcd_dma_desc) *
MAX_DMA_DESC_NUM_GENERIC, 512, SLAB_CACHE_DMA,
@@ -5122,7 +5122,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
* usable.
*/
hsotg->params.host_dma_desc = 0;
- hsotg->params.dma_desc_fs_enable = 0;
+ hsotg->params.host_dma_desc_fs = 0;
}
hsotg->desc_hsisoc_cache = kmem_cache_create("dwc2-hsisoc-desc",
@@ -5139,7 +5139,7 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq)
* usable.
*/
hsotg->params.host_dma_desc = 0;
- hsotg->params.dma_desc_fs_enable = 0;
+ hsotg->params.host_dma_desc_fs = 0;
}
}
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c
index 5aa6887..db3e448 100644
--- a/drivers/usb/dwc2/hcd_intr.c
+++ b/drivers/usb/dwc2/hcd_intr.c
@@ -395,7 +395,7 @@ static void dwc2_port_intr(struct dwc2_hsotg *hsotg)
dwc2_hprt0_enable(hsotg, hprt0, &hprt0_modify);
} else {
hsotg->flags.b.port_enable_change = 1;
- if (hsotg->params.dma_desc_fs_enable) {
+ if (hsotg->params.host_dma_desc_fs) {
u32 hcfg;
hsotg->params.host_dma_desc = 0;
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index 8a9bad4..107fd79 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -43,7 +43,7 @@ static const struct dwc2_core_params params_hi6220 = {
.otg_ver = 0, /* 1.3 */
.host_dma = 1,
.host_dma_desc = 0,
- .dma_desc_fs_enable = 0,
+ .host_dma_desc_fs = 0,
.speed = 0, /* High Speed */
.enable_dynamic_fifo = 1,
.en_multiple_tx_fifo = 1,
@@ -75,7 +75,7 @@ static const struct dwc2_core_params params_bcm2835 = {
.otg_ver = 0, /* 1.3 */
.host_dma = 1,
.host_dma_desc = 0,
- .dma_desc_fs_enable = 0,
+ .host_dma_desc_fs = 0,
.speed = 0, /* High Speed */
.enable_dynamic_fifo = 1,
.en_multiple_tx_fifo = 1,
@@ -106,7 +106,7 @@ static const struct dwc2_core_params params_rk3066 = {
.otg_ver = -1,
.host_dma = -1,
.host_dma_desc = 0,
- .dma_desc_fs_enable = 0,
+ .host_dma_desc_fs = 0,
.speed = -1,
.enable_dynamic_fifo = 1,
.en_multiple_tx_fifo = -1,
@@ -138,7 +138,7 @@ static const struct dwc2_core_params params_ltq = {
.otg_ver = -1,
.host_dma = -1,
.host_dma_desc = -1,
- .dma_desc_fs_enable = -1,
+ .host_dma_desc_fs = 0,
.speed = -1,
.enable_dynamic_fifo = -1,
.en_multiple_tx_fifo = -1,
@@ -170,7 +170,7 @@ static const struct dwc2_core_params params_amlogic = {
.otg_ver = -1,
.host_dma = 1,
.host_dma_desc = 0,
- .dma_desc_fs_enable = 0,
+ .host_dma_desc_fs = 0,
.speed = DWC2_SPEED_PARAM_HIGH,
.enable_dynamic_fifo = 1,
.en_multiple_tx_fifo = -1,
@@ -208,7 +208,7 @@ static const struct dwc2_core_params params_default = {
* Disable it for FS devices as well.
*/
.host_dma_desc = 0,
- .dma_desc_fs_enable = 0,
+ .host_dma_desc_fs = 0,
.speed = -1,
.enable_dynamic_fifo = -1,
@@ -517,7 +517,7 @@ static void dwc2_set_param_host_dma_desc(struct dwc2_hsotg *hsotg, int val)
hsotg->params.host_dma_desc = val;
}
-static void dwc2_set_param_dma_desc_fs_enable(struct dwc2_hsotg *hsotg, int val)
+static void dwc2_set_param_host_dma_desc_fs(struct dwc2_hsotg *hsotg, int val)
{
int valid = 1;
@@ -530,14 +530,14 @@ static void dwc2_set_param_dma_desc_fs_enable(struct dwc2_hsotg *hsotg, int val)
if (!valid) {
if (val >= 0)
dev_err(hsotg->dev,
- "%d invalid for dma_desc_fs_enable parameter. Check HW configuration.\n",
+ "%d invalid for host_dma_desc_fs parameter. Check HW configuration.\n",
val);
val = (hsotg->params.host_dma > 0 &&
hsotg->hw_params.dma_desc_enable);
}
- hsotg->params.dma_desc_fs_enable = val;
- dev_dbg(hsotg->dev, "Setting dma_desc_fs_enable to %d\n", val);
+ hsotg->params.host_dma_desc_fs = val;
+ dev_dbg(hsotg->dev, "Setting host_dma_desc_fs to %d\n", val);
}
static void
@@ -1117,7 +1117,7 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
dwc2_set_param_otg_cap(hsotg, params->otg_cap);
dwc2_set_param_host_dma(hsotg, params->host_dma);
dwc2_set_param_host_dma_desc(hsotg, params->host_dma_desc);
- dwc2_set_param_dma_desc_fs_enable(hsotg, params->dma_desc_fs_enable);
+ dwc2_set_param_host_dma_desc_fs(hsotg, params->host_dma_desc_fs);
dwc2_set_param_host_support_fs_ls_low_power(hsotg,
params->host_support_fs_ls_low_power);
dwc2_set_param_enable_dynamic_fifo(hsotg,
--
2.10.0
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
