commit f60c0259ce7e2b7f0f9ebd9ec27c4184f994fcd1
author Hemant Kumar <hemantk@codeaurora.org> Thu Nov 03 12:37:07 2011 -0700
committer Jack Pham <jackp@codeaurora.org> Tue Nov 29 14:25:24 2011 -0800
tree 5cdfd22d24b78088ea912dca4412638e6a41976b
parent 40a1f1e4ea5edff7dbe26b2fc3d0184cab32394e

usb: gadget: modify gserial and grmnet structures

Rename send_cpkt_request to send_encap_cmd & send_cbits_tomodem
to notify_modem.
Update notify_modem and send_encap_cmd functions' parameter to
void pointer.
Remove struct grmnet pointer parameter from send_encap_cmd
function.

Above changes are done to come up with generic callbacks registered
by transport drivers for both the structures.

Change-Id: I149386186d42a5c77adca2da2a7b4bdcf4c01e88
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>

drivers/usb/gadget/f_rmnet.c

diff --git a/drivers/usb/gadget/f_rmnet.c b/drivers/usb/gadget/f_rmnet.c
index 7686bf2..db43f95 100644
--- a/drivers/usb/gadget/f_rmnet.c
+++ b/drivers/usb/gadget/f_rmnet.c
@@ -466,16 +466,24 @@
 }
 
 static int
-frmnet_send_cpkt_response(struct grmnet *gr, struct rmnet_ctrl_pkt *cpkt)
+frmnet_send_cpkt_response(void *gr, void *buf, size_t len)
 {
 	struct f_rmnet		*dev;
+	struct rmnet_ctrl_pkt	*cpkt;
 	unsigned long		flags;
 
-	if (!gr || !cpkt) {
-		pr_err("%s: Invalid grmnet/cpkt, grmnet:%p cpkt:%p\n",
-				__func__, gr, cpkt);
+	if (!gr || !buf) {
+		pr_err("%s: Invalid grmnet/buf, grmnet:%p buf:%p\n",
+				__func__, gr, buf);
 		return -ENODEV;
 	}
+	cpkt = rmnet_alloc_ctrl_pkt(len, GFP_ATOMIC);
+	if (IS_ERR(cpkt)) {
+		pr_err("%s: Unable to allocate ctrl pkt\n", __func__);
+		return -ENOMEM;
+	}
+	memcpy(cpkt->buf, buf, len);
+	cpkt->len = len;
 
 	dev = port_to_rmnet(gr);
 
@@ -500,7 +508,6 @@
 {
 	struct f_rmnet			*dev = req->context;
 	struct usb_composite_dev	*cdev;
-	struct rmnet_ctrl_pkt		*cpkt;
 
 	if (!dev) {
 		pr_err("%s: rmnet dev is null\n", __func__);
@@ -511,16 +518,8 @@
 
 	cdev = dev->cdev;
 
-	cpkt = rmnet_alloc_ctrl_pkt(req->actual, GFP_ATOMIC);
-	if (IS_ERR(cpkt)) {
-		pr_err("%s: Unable to allocate ctrl pkt\n", __func__);
-		return;
-	}
-
-	memcpy(cpkt->buf, req->buf, req->actual);
-
-	if (dev->port.send_cpkt_request)
-		dev->port.send_cpkt_request(&dev->port, dev->port_num, cpkt);
+	if (dev->port.send_encap_cmd)
+		dev->port.send_encap_cmd(dev->port_num, req->buf, req->actual);
 }
 
 static void frmnet_notify_complete(struct usb_ep *ep, struct usb_request *req)
@@ -615,8 +614,8 @@
 		break;
 	case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8)
 			| USB_CDC_REQ_SET_CONTROL_LINE_STATE:
-		if (dev->port.send_cbits_tomodem)
-			dev->port.send_cbits_tomodem(&dev->port,
+		if (dev->port.notify_modem)
+			dev->port.notify_modem(&dev->port,
 							dev->port_num,
 							w_value);
 		ret = 0;