greybus: hd: rename host-device structure

[cascardo/linux.git] / drivers / staging / greybus / es1.c

diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index ba025e7..07e1a14 100644 (file)
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -60,7 +60,7 @@ static DEFINE_KFIFO(apb1_log_fifo, char, APB1_LOG_SIZE);
  * es1_ap_dev - ES1 USB Bridge to AP structure
  * @usb_dev: pointer to the USB device we are.
  * @usb_intf: pointer to the USB interface we are bound to.
- * @hd: pointer to our greybus_host_device structure
+ * @hd: pointer to our gb_host_device structure
  * @cport_in_endpoint: bulk in endpoint for CPort data
  * @cport-out_endpoint: bulk out endpoint for CPort data
  * @cport_in_urb: array of urbs for the CPort in messages
@@ -75,7 +75,7 @@ static DEFINE_KFIFO(apb1_log_fifo, char, APB1_LOG_SIZE);
 struct es1_ap_dev {
        struct usb_device *usb_dev;
        struct usb_interface *usb_intf;
-       struct greybus_host_device *hd;
+       struct gb_host_device *hd;
 
        __u8 cport_in_endpoint;
        __u8 cport_out_endpoint;
@@ -88,7 +88,7 @@ struct es1_ap_dev {
        spinlock_t cport_out_urb_lock;
 };
 
-static inline struct es1_ap_dev *hd_to_es1(struct greybus_host_device *hd)
+static inline struct es1_ap_dev *hd_to_es1(struct gb_host_device *hd)
 {
        return (struct es1_ap_dev *)&hd->hd_priv;
 }
@@ -181,7 +181,7 @@ static u16 gb_message_cport_unpack(struct gb_operation_msg_hdr *header)
  * Returns zero if the message was successfully queued, or a negative errno
  * otherwise.
  */
-static int message_send(struct greybus_host_device *hd, u16 cport_id,
+static int message_send(struct gb_host_device *hd, u16 cport_id,
                        struct gb_message *message, gfp_t gfp_mask)
 {
        struct es1_ap_dev *es1 = hd_to_es1(hd);
@@ -244,7 +244,7 @@ static int message_send(struct greybus_host_device *hd, u16 cport_id,
  */
 static void message_cancel(struct gb_message *message)
 {
-       struct greybus_host_device *hd = message->operation->connection->hd;
+       struct gb_host_device *hd = message->operation->connection->hd;
        struct es1_ap_dev *es1 = hd_to_es1(hd);
        struct urb *urb;
        int i;
@@ -277,7 +277,7 @@ static void message_cancel(struct gb_message *message)
        usb_free_urb(urb);
 }
 
-static int latency_tag_enable(struct greybus_host_device *hd, u16 cport_id)
+static int latency_tag_enable(struct gb_host_device *hd, u16 cport_id)
 {
        int retval;
        struct es1_ap_dev *es1 = hd_to_es1(hd);
@@ -301,7 +301,7 @@ static int latency_tag_enable(struct greybus_host_device *hd, u16 cport_id)
        return retval;
 }
 
-static int latency_tag_disable(struct greybus_host_device *hd, u16 cport_id)
+static int latency_tag_disable(struct gb_host_device *hd, u16 cport_id)
 {
        int retval;
        struct es1_ap_dev *es1 = hd_to_es1(hd);
@@ -403,7 +403,7 @@ static void ap_disconnect(struct usb_interface *interface)
 
 static void cport_in_callback(struct urb *urb)
 {
-       struct greybus_host_device *hd = urb->context;
+       struct gb_host_device *hd = urb->context;
        struct device *dev = &urb->dev->dev;
        struct gb_operation_msg_hdr *header;
        int status = check_urb_status(urb);
@@ -443,7 +443,7 @@ exit:
 static void cport_out_callback(struct urb *urb)
 {
        struct gb_message *message = urb->context;
-       struct greybus_host_device *hd = message->operation->connection->hd;
+       struct gb_host_device *hd = message->operation->connection->hd;
        struct es1_ap_dev *es1 = hd_to_es1(hd);
        int status = check_urb_status(urb);
        unsigned long flags;
@@ -599,7 +599,7 @@ static int ap_probe(struct usb_interface *interface,
                    const struct usb_device_id *id)
 {
        struct es1_ap_dev *es1;
-       struct greybus_host_device *hd;
+       struct gb_host_device *hd;
        struct usb_device *udev;
        struct usb_host_interface *iface_desc;
        struct usb_endpoint_descriptor *endpoint;