r8152: store the information of the pipes

Store the information of the pipes to avoid calling usb_rcvctrlpipe(),
usb_sndctrlpipe(), usb_rcvbulkpipe(), usb_sndbulkpipe(), and
usb_rcvintpipe() frequently.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 85039e17f4cd3c77c94fef87e64e6476c841c15b..62cd48dc28788cf46c74e89d281f54ec05e9a6a2 100644 (file)
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -931,6 +931,8 @@ struct r8152 {
        u32 rx_pending;
        u32 fc_pause_on, fc_pause_off;
 
+       unsigned int pipe_in, pipe_out, pipe_intr, pipe_ctrl_in, pipe_ctrl_out;
+
        u32 support_2500full:1;
        u32 lenovo_macpassthru:1;
        u32 dell_tb_rx_agg_bug:1;
@@ -1198,7 +1200,7 @@ int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
        if (!tmp)
                return -ENOMEM;
 
-       ret = usb_control_msg(tp->udev, usb_rcvctrlpipe(tp->udev, 0),
+       ret = usb_control_msg(tp->udev, tp->pipe_ctrl_in,
                              RTL8152_REQ_GET_REGS, RTL8152_REQT_READ,
                              value, index, tmp, size, 500);
        if (ret < 0)
@@ -1221,7 +1223,7 @@ int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
        if (!tmp)
                return -ENOMEM;
 
-       ret = usb_control_msg(tp->udev, usb_sndctrlpipe(tp->udev, 0),
+       ret = usb_control_msg(tp->udev, tp->pipe_ctrl_out,
                              RTL8152_REQ_SET_REGS, RTL8152_REQT_WRITE,
                              value, index, tmp, size, 500);
 
@@ -2041,7 +2043,7 @@ static int alloc_all_mem(struct r8152 *tp)
                goto err1;
 
        tp->intr_interval = (int)ep_intr->desc.bInterval;
-       usb_fill_int_urb(tp->intr_urb, tp->udev, usb_rcvintpipe(tp->udev, 3),
+       usb_fill_int_urb(tp->intr_urb, tp->udev, tp->pipe_intr,
                         tp->intr_buff, INTBUFSIZE, intr_callback,
                         tp, tp->intr_interval);
 
@@ -2305,7 +2307,7 @@ static int r8152_tx_agg_fill(struct r8152 *tp, struct tx_agg *agg)
        if (ret < 0)
                goto out_tx_fill;
 
-       usb_fill_bulk_urb(agg->urb, tp->udev, usb_sndbulkpipe(tp->udev, 2),
+       usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_out,
                          agg->head, (int)(tx_data - (u8 *)agg->head),
                          (usb_complete_t)write_bulk_callback, agg);
 
@@ -2620,7 +2622,7 @@ int r8152_submit_rx(struct r8152 *tp, struct rx_agg *agg, gfp_t mem_flags)
            !test_bit(WORK_ENABLE, &tp->flags) || !netif_carrier_ok(tp->netdev))
                return 0;
 
-       usb_fill_bulk_urb(agg->urb, tp->udev, usb_rcvbulkpipe(tp->udev, 1),
+       usb_fill_bulk_urb(agg->urb, tp->udev, tp->pipe_in,
                          agg->buffer, tp->rx_buf_sz,
                          (usb_complete_t)read_bulk_callback, agg);
 
@@ -9507,6 +9509,12 @@ static int rtl8152_probe(struct usb_interface *intf,
        tp->intf = intf;
        tp->version = version;
 
+       tp->pipe_ctrl_in = usb_rcvctrlpipe(udev, 0);
+       tp->pipe_ctrl_out = usb_sndctrlpipe(udev, 0);
+       tp->pipe_in = usb_rcvbulkpipe(udev, 1);
+       tp->pipe_out = usb_sndbulkpipe(udev, 2);
+       tp->pipe_intr = usb_rcvintpipe(udev, 3);
+
        switch (version) {
        case RTL_VER_01:
        case RTL_VER_02: