global: Migrate CONFIG_STACKBASE to CFG

[platform/kernel/u-boot.git] / include / usb_ether.h

diff --git a/include/usb_ether.h b/include/usb_ether.h
index e85acad..18d7184 100644 (file)
--- a/include/usb_ether.h
+++ b/include/usb_ether.h
@@ -8,19 +8,13 @@
 
 #include <net.h>
 
-/* TODO(sjg@chromium.org): Remove @pusb_dev when all boards use CONFIG_DM_ETH */
+/* TODO(sjg@chromium.org): Remove @pusb_dev now that all boards use CONFIG_DM_ETH */
 struct ueth_data {
        /* eth info */
-#ifdef CONFIG_DM_ETH
        uint8_t *rxbuf;
        int rxsize;
        int rxlen;                      /* Total bytes available in rxbuf */
        int rxptr;                      /* Current position in rxbuf */
-#else
-       struct eth_device eth_dev;      /* used with eth_register */
-       /* driver private */
-       void *dev_priv;
-#endif
        int phy_id;                     /* mii phy id */
 
        /* usb info */
@@ -34,7 +28,6 @@ struct ueth_data {
        unsigned char   irqinterval;    /* Intervall for IRQ Pipe */
 };
 
-#ifdef CONFIG_DM_ETH
 /**
  * usb_ether_register() - register a new USB ethernet device
  *
@@ -43,7 +36,7 @@ struct ueth_data {
  * @dev:       USB device
  * @ss:                Place to put USB ethernet data
  * @rxsize:    Maximum size to allocate for the receive buffer
- * @return 0 if OK, -ve on error
+ * Return: 0 if OK, -ve on error
  */
 int usb_ether_register(struct udevice *dev, struct ueth_data *ueth, int rxsize);
 
@@ -51,7 +44,7 @@ int usb_ether_register(struct udevice *dev, struct ueth_data *ueth, int rxsize);
  * usb_ether_deregister() - deregister a USB ethernet device
  *
  * @ueth:      USB Ethernet device
- * @return 0
+ * Return: 0
  */
 int usb_ether_deregister(struct ueth_data *ueth);
 
@@ -62,7 +55,7 @@ int usb_ether_deregister(struct ueth_data *ueth);
  *
  * @ueth:      USB Ethernet device
  * @rxsize:    Maximum size to receive
- * @return 0 if a packet was received, -EAGAIN if not, -ENOSPC if @rxsize is
+ * Return: 0 if a packet was received, -EAGAIN if not, -ENOSPC if @rxsize is
  * larger than the size passed ot usb_ether_register(), other -ve on error
  */
 int usb_ether_receive(struct ueth_data *ueth, int rxsize);
@@ -77,7 +70,7 @@ int usb_ether_receive(struct ueth_data *ueth, int rxsize);
  * @ueth:      USB Ethernet device
  * @ptrp:      Returns a pointer to the start of the next packet if there is
  *             one available
- * @return number of bytes available, or 0 if none
+ * Return: number of bytes available, or 0 if none
  */
 int usb_ether_get_rx_bytes(struct ueth_data *ueth, uint8_t **ptrp);
 
@@ -92,40 +85,5 @@ int usb_ether_get_rx_bytes(struct ueth_data *ueth, uint8_t **ptrp);
  * @num_bytes: Number of bytes to skip, or -1 to skip all bytes
  */
 void usb_ether_advance_rxbuf(struct ueth_data *ueth, int num_bytes);
-#else
-/*
- * Function definitions for each USB ethernet driver go here
- * (declaration is unconditional, compilation is conditional)
- */
-void asix_eth_before_probe(void);
-int asix_eth_probe(struct usb_device *dev, unsigned int ifnum,
-                     struct ueth_data *ss);
-int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-                     struct eth_device *eth);
-
-void ax88179_eth_before_probe(void);
-int ax88179_eth_probe(struct usb_device *dev, unsigned int ifnum,
-                     struct ueth_data *ss);
-int ax88179_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-                     struct eth_device *eth);
-
-void mcs7830_eth_before_probe(void);
-int mcs7830_eth_probe(struct usb_device *dev, unsigned int ifnum,
-                     struct ueth_data *ss);
-int mcs7830_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-                        struct eth_device *eth);
-
-void smsc95xx_eth_before_probe(void);
-int smsc95xx_eth_probe(struct usb_device *dev, unsigned int ifnum,
-                       struct ueth_data *ss);
-int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-                       struct eth_device *eth);
-
-void r8152_eth_before_probe(void);
-int r8152_eth_probe(struct usb_device *dev, unsigned int ifnum,
-                   struct ueth_data *ss);
-int r8152_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
-                      struct eth_device *eth);
-#endif
 
 #endif /* __USB_ETHER_H__ */