[PATCH v4 36/46] usb/gadget: g_ffs: use consistent naming for config bind functions

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The old function interface included an rndis_bind_config function.
In order not to conflict with this function the new interface
used an rndis_new_bind_config. Now that the old interface is
removed the latter can be called rndis_bind_config to match
its counterpart eth_bind_config.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
 drivers/usb/gadget/g_ffs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index deaa11a..71164fb 100644
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -44,7 +44,7 @@ static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
 #  endif
 #  ifdef CONFIG_USB_FUNCTIONFS_RNDIS
 
-static int rndis_new_bind_config(struct usb_configuration *c,
+static int rndis_bind_config(struct usb_configuration *c,
 				 u8 ethaddr[ETH_ALEN], struct eth_dev *dev);
 #  endif
 #else
@@ -151,7 +151,7 @@ static struct gfs_configuration {
 } gfs_configurations[] = {
 #ifdef CONFIG_USB_FUNCTIONFS_RNDIS
 	{
-		.eth		= rndis_new_bind_config,
+		.eth		= rndis_bind_config,
 	},
 #endif
 
@@ -581,7 +581,7 @@ static int eth_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
 
 #ifdef CONFIG_USB_FUNCTIONFS_RNDIS
 
-static int rndis_new_bind_config(struct usb_configuration *c,
+static int rndis_bind_config(struct usb_configuration *c,
 				 u8 ethaddr[ETH_ALEN], struct eth_dev *dev)
 {
 	struct gfs_configuration *gfs_conf;
-- 
1.7.0.4

--
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


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux