On 05/18/2017 04:08 AM, Yuyang Du wrote:
> From: Yuyang Du <yuyang.du@xxxxxxxxx>
>
> These helper function names are renamed to have their full struct
> names to avoid confusion:
>
> - hcd_to_vhci() -> hcd_to_vhci_hcd()
> - vhci_to_hcd() -> vhci_hcd_to_hcd()
> - vdev_to_vhci() -> vdev_to_vhci_hcd()
>
> Signed-off-by: Yuyang Du <yuyang.du@xxxxxxxxx>
Thanks. Looks good to me.
Acked-by: Shuah Khan <shuahkh@xxxxxxxxxxxxxxx>
thanks,
-- Shuah
> ---
> drivers/usb/usbip/vhci.h | 11 +++++------
> drivers/usb/usbip/vhci_hcd.c | 34 +++++++++++++++++-----------------
> drivers/usb/usbip/vhci_rx.c | 12 ++++++------
> drivers/usb/usbip/vhci_sysfs.c | 6 +++---
> 4 files changed, 31 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
> index 88b71c4..bff472f 100644
> --- a/drivers/usb/usbip/vhci.h
> +++ b/drivers/usb/usbip/vhci.h
> @@ -134,7 +134,7 @@ static inline int port_to_pdev_nr(__u32 port)
> return port / VHCI_HC_PORTS;
> }
>
> -static inline struct vhci_hcd *hcd_to_vhci(struct usb_hcd *hcd)
> +static inline struct vhci_hcd *hcd_to_vhci_hcd(struct usb_hcd *hcd)
> {
> return (struct vhci_hcd *) (hcd->hcd_priv);
> }
> @@ -149,15 +149,14 @@ static inline const char *hcd_name(struct usb_hcd *hcd)
> return (hcd)->self.bus_name;
> }
>
> -static inline struct usb_hcd *vhci_to_hcd(struct vhci_hcd *vhci)
> +static inline struct usb_hcd *vhci_hcd_to_hcd(struct vhci_hcd *vhci_hcd)
> {
> - return container_of((void *) vhci, struct usb_hcd, hcd_priv);
> + return container_of((void *) vhci_hcd, struct usb_hcd, hcd_priv);
> }
>
> -static inline struct vhci_hcd *vdev_to_vhci(struct vhci_device *vdev)
> +static inline struct vhci_hcd *vdev_to_vhci_hcd(struct vhci_device *vdev)
> {
> - return container_of(
> - (void *)(vdev - vdev->rhport), struct vhci_hcd, vdev);
> + return container_of((void *)(vdev - vdev->rhport), struct vhci_hcd, vdev);
> }
>
> #endif /* __USBIP_VHCI_H */
> diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
> index 5d8b2c2..624265a 100644
> --- a/drivers/usb/usbip/vhci_hcd.c
> +++ b/drivers/usb/usbip/vhci_hcd.c
> @@ -124,7 +124,7 @@ static void dump_port_status_diff(u32 prev_status, u32 new_status)
>
> void rh_port_connect(struct vhci_device *vdev, enum usb_device_speed speed)
> {
> - struct vhci_hcd *vhci = vdev_to_vhci(vdev);
> + struct vhci_hcd *vhci = vdev_to_vhci_hcd(vdev);
> int rhport = vdev->rhport;
> u32 status;
> unsigned long flags;
> @@ -152,12 +152,12 @@ void rh_port_connect(struct vhci_device *vdev, enum usb_device_speed speed)
>
> spin_unlock_irqrestore(&vhci->lock, flags);
>
> - usb_hcd_poll_rh_status(vhci_to_hcd(vhci));
> + usb_hcd_poll_rh_status(vhci_hcd_to_hcd(vhci));
> }
>
> static void rh_port_disconnect(struct vhci_device *vdev)
> {
> - struct vhci_hcd *vhci = vdev_to_vhci(vdev);
> + struct vhci_hcd *vhci = vdev_to_vhci_hcd(vdev);
> int rhport = vdev->rhport;
> u32 status;
> unsigned long flags;
> @@ -174,7 +174,7 @@ static void rh_port_disconnect(struct vhci_device *vdev)
> vhci->port_status[rhport] = status;
>
> spin_unlock_irqrestore(&vhci->lock, flags);
> - usb_hcd_poll_rh_status(vhci_to_hcd(vhci));
> + usb_hcd_poll_rh_status(vhci_hcd_to_hcd(vhci));
> }
>
> #define PORT_C_MASK \
> @@ -206,7 +206,7 @@ static int vhci_hub_status(struct usb_hcd *hcd, char *buf)
> retval = DIV_ROUND_UP(VHCI_HC_PORTS + 1, 8);
> memset(buf, 0, retval);
>
> - vhci = hcd_to_vhci(hcd);
> + vhci = hcd_to_vhci_hcd(hcd);
>
> spin_lock_irqsave(&vhci->lock, flags);
> if (!HCD_HW_ACCESSIBLE(hcd)) {
> @@ -268,7 +268,7 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
> pr_err("invalid port number %d\n", wIndex);
> rhport = ((__u8)(wIndex & 0x00ff)) - 1;
>
> - dum = hcd_to_vhci(hcd);
> + dum = hcd_to_vhci_hcd(hcd);
>
> spin_lock_irqsave(&dum->lock, flags);
>
> @@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb, struct vhci_device *vdev)
> pr_err("could not get virtual device");
> return;
> }
> - vhci = vdev_to_vhci(vdev);
> + vhci = vdev_to_vhci_hcd(vdev);
>
> priv = kzalloc(sizeof(struct vhci_priv), GFP_ATOMIC);
> if (!priv) {
> @@ -468,7 +468,7 @@ static void vhci_tx_urb(struct urb *urb, struct vhci_device *vdev)
> static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
> gfp_t mem_flags)
> {
> - struct vhci_hcd *vhci = hcd_to_vhci(hcd);
> + struct vhci_hcd *vhci = hcd_to_vhci_hcd(hcd);
> struct device *dev = &urb->dev->dev;
> u8 portnum = urb->dev->portnum;
> int ret = 0;
> @@ -635,7 +635,7 @@ static int vhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb,
> */
> static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
> {
> - struct vhci_hcd *vhci = hcd_to_vhci(hcd);
> + struct vhci_hcd *vhci = hcd_to_vhci_hcd(hcd);
> struct vhci_priv *priv;
> struct vhci_device *vdev;
> unsigned long flags;
> @@ -686,7 +686,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
> usb_hcd_unlink_urb_from_ep(hcd, urb);
>
> spin_unlock_irqrestore(&vhci->lock, flags);
> - usb_hcd_giveback_urb(vhci_to_hcd(vhci), urb, urb->status);
> + usb_hcd_giveback_urb(vhci_hcd_to_hcd(vhci), urb, urb->status);
> spin_lock_irqsave(&vhci->lock, flags);
>
> } else {
> @@ -728,8 +728,8 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
>
> static void vhci_device_unlink_cleanup(struct vhci_device *vdev)
> {
> - struct vhci_hcd *vhci = vdev_to_vhci(vdev);
> - struct usb_hcd *hcd = vhci_to_hcd(vhci);
> + struct vhci_hcd *vhci = vdev_to_vhci_hcd(vdev);
> + struct usb_hcd *hcd = vhci_hcd_to_hcd(vhci);
> struct vhci_unlink *unlink, *tmp;
> unsigned long flags;
>
> @@ -915,7 +915,7 @@ static int hcd_name_to_id(const char *name)
>
> static int vhci_start(struct usb_hcd *hcd)
> {
> - struct vhci_hcd *vhci = hcd_to_vhci(hcd);
> + struct vhci_hcd *vhci = hcd_to_vhci_hcd(hcd);
> int id, rhport;
> int err = 0;
>
> @@ -963,7 +963,7 @@ static int vhci_start(struct usb_hcd *hcd)
>
> static void vhci_stop(struct usb_hcd *hcd)
> {
> - struct vhci_hcd *vhci = hcd_to_vhci(hcd);
> + struct vhci_hcd *vhci = hcd_to_vhci_hcd(hcd);
> int id, rhport;
>
> usbip_dbg_vhci_hc("stop VHCI controller\n");
> @@ -995,7 +995,7 @@ static int vhci_get_frame_number(struct usb_hcd *hcd)
> /* FIXME: suspend/resume */
> static int vhci_bus_suspend(struct usb_hcd *hcd)
> {
> - struct vhci_hcd *vhci = hcd_to_vhci(hcd);
> + struct vhci_hcd *vhci = hcd_to_vhci_hcd(hcd);
> unsigned long flags;
>
> dev_dbg(&hcd->self.root_hub->dev, "%s\n", __func__);
> @@ -1009,7 +1009,7 @@ static int vhci_bus_suspend(struct usb_hcd *hcd)
>
> static int vhci_bus_resume(struct usb_hcd *hcd)
> {
> - struct vhci_hcd *vhci = hcd_to_vhci(hcd);
> + struct vhci_hcd *vhci = hcd_to_vhci_hcd(hcd);
> int rc = 0;
> unsigned long flags;
>
> @@ -1119,7 +1119,7 @@ static int vhci_hcd_suspend(struct platform_device *pdev, pm_message_t state)
> hcd = platform_get_drvdata(pdev);
> if (!hcd)
> return 0;
> - vhci = hcd_to_vhci(hcd);
> + vhci = hcd_to_vhci_hcd(hcd);
>
> spin_lock_irqsave(&vhci->lock, flags);
>
> diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
> index fc2d319..85abe89 100644
> --- a/drivers/usb/usbip/vhci_rx.c
> +++ b/drivers/usb/usbip/vhci_rx.c
> @@ -70,7 +70,7 @@ struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum)
> static void vhci_recv_ret_submit(struct vhci_device *vdev,
> struct usbip_header *pdu)
> {
> - struct vhci_hcd *vhci = vdev_to_vhci(vdev);
> + struct vhci_hcd *vhci = vdev_to_vhci_hcd(vdev);
> struct usbip_device *ud = &vdev->ud;
> struct urb *urb;
> unsigned long flags;
> @@ -107,10 +107,10 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
> usbip_dbg_vhci_rx("now giveback urb %p\n", urb);
>
> spin_lock_irqsave(&vhci->lock, flags);
> - usb_hcd_unlink_urb_from_ep(vhci_to_hcd(vhci), urb);
> + usb_hcd_unlink_urb_from_ep(vhci_hcd_to_hcd(vhci), urb);
> spin_unlock_irqrestore(&vhci->lock, flags);
>
> - usb_hcd_giveback_urb(vhci_to_hcd(vhci), urb, urb->status);
> + usb_hcd_giveback_urb(vhci_hcd_to_hcd(vhci), urb, urb->status);
>
> usbip_dbg_vhci_rx("Leave\n");
> }
> @@ -143,7 +143,7 @@ static struct vhci_unlink *dequeue_pending_unlink(struct vhci_device *vdev,
> static void vhci_recv_ret_unlink(struct vhci_device *vdev,
> struct usbip_header *pdu)
> {
> - struct vhci_hcd *vhci = vdev_to_vhci(vdev);
> + struct vhci_hcd *vhci = vdev_to_vhci_hcd(vdev);
> struct vhci_unlink *unlink;
> struct urb *urb;
> unsigned long flags;
> @@ -177,10 +177,10 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
> pr_info("urb->status %d\n", urb->status);
>
> spin_lock_irqsave(&vhci->lock, flags);
> - usb_hcd_unlink_urb_from_ep(vhci_to_hcd(vhci), urb);
> + usb_hcd_unlink_urb_from_ep(vhci_hcd_to_hcd(vhci), urb);
> spin_unlock_irqrestore(&vhci->lock, flags);
>
> - usb_hcd_giveback_urb(vhci_to_hcd(vhci), urb, urb->status);
> + usb_hcd_giveback_urb(vhci_hcd_to_hcd(vhci), urb, urb->status);
> }
>
> kfree(unlink);
> diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
> index b96e5b1..d878faa 100644
> --- a/drivers/usb/usbip/vhci_sysfs.c
> +++ b/drivers/usb/usbip/vhci_sysfs.c
> @@ -43,7 +43,7 @@ static ssize_t status_show_vhci(int pdev_nr, char *out)
> return 0;
> }
>
> - vhci = hcd_to_vhci(platform_get_drvdata(pdev));
> + vhci = hcd_to_vhci_hcd(platform_get_drvdata(pdev));
>
> spin_lock_irqsave(&vhci->lock, flags);
>
> @@ -212,7 +212,7 @@ static ssize_t store_detach(struct device *dev, struct device_attribute *attr,
> return -EAGAIN;
> }
>
> - ret = vhci_port_disconnect(hcd_to_vhci(hcd), rhport);
> + ret = vhci_port_disconnect(hcd_to_vhci_hcd(hcd), rhport);
> if (ret < 0)
> return -EINVAL;
>
> @@ -292,7 +292,7 @@ static ssize_t store_attach(struct device *dev, struct device_attribute *attr,
> dev_err(dev, "port %d is not ready\n", port);
> return -EAGAIN;
> }
> - vhci = hcd_to_vhci(hcd);
> + vhci = hcd_to_vhci_hcd(hcd);
> vdev = &vhci->vdev[rhport];
>
> /* Extract socket from fd. */
>
--
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
