usb: renesas_usbhs: Remove type member from renesas_usbhs_driver_param

Now no one uses the type member so that this patch removes it.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index 530e2eb..1872756 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -528,7 +528,6 @@ int usbhsc_schedule_notify_hotplug(struct platform_device *pdev)
 static const struct usbhs_of_data rcar_gen2_data = {
        .platform_callback = &usbhs_rcar2_ops,
        .param = {
-               .type = USBHS_TYPE_RCAR_GEN2,
                .has_usb_dmac = 1,
                .pipe_configs = usbhsc_new_pipe,
                .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
@@ -538,7 +537,6 @@ static const struct usbhs_of_data rcar_gen2_data = {
 static const struct usbhs_of_data rcar_gen3_data = {
        .platform_callback = &usbhs_rcar3_ops,
        .param = {
-               .type = USBHS_TYPE_RCAR_GEN3,
                .has_usb_dmac = 1,
                .multi_clks = 1,
                .pipe_configs = usbhsc_new_pipe,
@@ -549,7 +547,6 @@ static const struct usbhs_of_data rcar_gen3_data = {
 static const struct usbhs_of_data rcar_gen3_with_pll_data = {
        .platform_callback = &usbhs_rcar3_with_pll_ops,
        .param = {
-               .type = USBHS_TYPE_RCAR_GEN3_WITH_PLL,
                .has_usb_dmac = 1,
                .multi_clks = 1,
                .pipe_configs = usbhsc_new_pipe,
@@ -560,7 +557,6 @@ static const struct usbhs_of_data rcar_gen3_with_pll_data = {
 static const struct usbhs_of_data rza1_data = {
        .platform_callback = &usbhs_rza1_ops,
        .param = {
-               .type = USBHS_TYPE_RZA1,
                .pipe_configs = usbhsc_new_pipe,
                .pipe_size = ARRAY_SIZE(usbhsc_new_pipe),
        }
@@ -569,7 +565,6 @@ static const struct usbhs_of_data rza1_data = {
 static const struct usbhs_of_data rza2_data = {
        .platform_callback = &usbhs_rza2_ops,
        .param = {
-               .type = USBHS_TYPE_RZA2,
                .has_cnen = 1,
                .cfifo_byte_addr = 1,
                .pipe_configs = usbhsc_new_pipe,

diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index e249c21..fee84b7 100644 (file)
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -170,7 +170,6 @@ struct renesas_usbhs_driver_param {
         */
        int pio_dma_border; /* default is 64byte */
 
-       uintptr_t type;
        u32 enable_gpio;
 
        /*
@@ -184,12 +183,6 @@ struct renesas_usbhs_driver_param {
        u32 multi_clks:1;
 };
 
-#define USBHS_TYPE_RCAR_GEN2           1
-#define USBHS_TYPE_RCAR_GEN3           2
-#define USBHS_TYPE_RCAR_GEN3_WITH_PLL  3
-#define USBHS_TYPE_RZA1                        4
-#define USBHS_TYPE_RZA2                        5
-
 /*
  * option:
  *