From 440a5742393bb959fd7bce28f5c916355d8607ca Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sat, 8 Mar 2014 19:46:13 +0100 Subject: usb: net: don't ifdef routine declarations in usb_ether.h while compilation of implemented routines and references from calling sites may be optional, declarations in header files should not be unconditionally declare the Asix and SMSC related public USB ethernet driver routines in the usb_ether.h header file Signed-off-by: Gerhard Sittig Acked-by: Simon Glass Acked-by: Marek Vasut --- include/usb_ether.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include/usb_ether.h') diff --git a/include/usb_ether.h b/include/usb_ether.h index 678c9dff252..011ead7a364 100644 --- a/include/usb_ether.h +++ b/include/usb_ether.h @@ -40,23 +40,19 @@ struct ueth_data { }; /* - * Function definitions for each USB ethernet driver go here, bracketed by - * #ifdef CONFIG_USB_ETHER_xxx...#endif + * Function definitions for each USB ethernet driver go here + * (declaration is unconditional, compilation is conditional) */ -#ifdef CONFIG_USB_ETHER_ASIX 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); -#endif -#ifdef CONFIG_USB_ETHER_SMSC95XX 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); -#endif #endif /* __USB_ETHER_H__ */ -- cgit v1.2.3 From df4fb1c36d35021c27aa9fb43062741712022ad3 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sat, 8 Mar 2014 19:46:14 +0100 Subject: usb: net: introduce support for Moschip USB ethernet introduce an 'mcs7830' driver for Moschip MCS7830 based (7730/7830/7832) USB 2.0 Ethernet Devices see "MCS7830 -- USB 2.0 to 10/100M Fast Ethernet Controller" at http://www.asix.com.tw/products.php?op=pItemdetail&PItemID=109;74;109 the driver was implemented based on the U-Boot Asix driver with additional information gathered from the Moschip Linux driver, development was done on "Delock 61147" and "Logilink UA0025C" dongles Signed-off-by: Gerhard Sittig Acked-by: Marek Vasut --- include/usb_ether.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/usb_ether.h') diff --git a/include/usb_ether.h b/include/usb_ether.h index 011ead7a364..35700a21b59 100644 --- a/include/usb_ether.h +++ b/include/usb_ether.h @@ -49,6 +49,12 @@ int asix_eth_probe(struct usb_device *dev, unsigned int ifnum, int asix_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); -- cgit v1.2.3