usb: musb: remove unused members in struct musb_hdrc_config

The following members in struct musb_hdrc_config are not used,
so remove them.

soft_con
utm_16
big_endian
mult_bulk_tx
mult_bulk_rx
high_iso_tx
high_iso_rx
dma
dma_channels
dyn_fifo_size
vendor_ctrl
vendor_stat
vendor_req
dma_req_chan
musb_hdrc_eps_bits

Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/musb/sunxi.c b/drivers/usb/musb/sunxi.c
index 8f7d378b7e7ed7b25e71899e3fee5532ec347d7c..62ab2ca03779259b38e961fd931aabd06ba19756 100644 (file)
--- a/drivers/usb/musb/sunxi.c
+++ b/drivers/usb/musb/sunxi.c
@@ -651,10 +651,8 @@ static const struct musb_hdrc_config sunxi_musb_hdrc_config = {
        .fifo_cfg_size  = ARRAY_SIZE(sunxi_musb_mode_cfg),
        .multipoint     = true,
        .dyn_fifo       = true,
-       .soft_con       = true,
        .num_eps        = SUNXI_MUSB_MAX_EP_NUM,
        .ram_bits       = SUNXI_MUSB_RAM_BITS,
-       .dma            = 0,
 };
 
 static struct musb_hdrc_config sunxi_musb_hdrc_config_h3 = {
@@ -662,10 +660,8 @@ static struct musb_hdrc_config sunxi_musb_hdrc_config_h3 = {
        .fifo_cfg_size  = ARRAY_SIZE(sunxi_musb_mode_cfg_h3),
        .multipoint     = true,
        .dyn_fifo       = true,
-       .soft_con       = true,
        .num_eps        = SUNXI_MUSB_MAX_EP_NUM_H3,
        .ram_bits       = SUNXI_MUSB_RAM_BITS,
-       .dma            = 0,
 };
 
 

diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index 9eb908a9803383c3806c394da4a243a0311e1a4f..fc6c77918481691ff0eca422b60b359dcbc3b4ef 100644 (file)
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -67,28 +67,13 @@ struct musb_hdrc_config {
        /* MUSB configuration-specific details */
        unsigned        multipoint:1;   /* multipoint device */
        unsigned        dyn_fifo:1 __deprecated; /* supports dynamic fifo sizing */
-       unsigned        soft_con:1 __deprecated; /* soft connect required */
-       unsigned        utm_16:1 __deprecated; /* utm data witdh is 16 bits */
-       unsigned        big_endian:1;   /* true if CPU uses big-endian */
-       unsigned        mult_bulk_tx:1; /* Tx ep required for multbulk pkts */
-       unsigned        mult_bulk_rx:1; /* Rx ep required for multbulk pkts */
-       unsigned        high_iso_tx:1;  /* Tx ep required for HB iso */
-       unsigned        high_iso_rx:1;  /* Rx ep required for HD iso */
-       unsigned        dma:1 __deprecated; /* supports DMA */
-       unsigned        vendor_req:1 __deprecated; /* vendor registers required */
 
        /* need to explicitly de-assert the port reset after resume? */
        unsigned        host_port_deassert_reset_at_resume:1;
 
        u8              num_eps;        /* number of endpoints _with_ ep0 */
-       u8              dma_channels __deprecated; /* number of dma channels */
-       u8              dyn_fifo_size;  /* dynamic size in bytes */
-       u8              vendor_ctrl __deprecated; /* vendor control reg width */
-       u8              vendor_stat __deprecated; /* vendor status reg witdh */
-       u8              dma_req_chan __deprecated; /* bitmask for required dma channels */
        u8              ram_bits;       /* ram address size */
 
-       struct musb_hdrc_eps_bits *eps_bits __deprecated;
        u32             maximum_speed;
 };