Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60664fe0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: gadget: Remove support for SDIO transport"

parents 0834f3f2 05206b28

arch/arm/mach-msm/include/mach/usb_gadget_xport.h

+0 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
enum transport_type {

	USB_GADGET_XPORT_UNDEF,

	USB_GADGET_XPORT_TTY,

	USB_GADGET_XPORT_SDIO,

	USB_GADGET_XPORT_SMD,

	USB_GADGET_XPORT_QTI,

	USB_GADGET_XPORT_BAM,
@@ -36,8 +35,6 @@ static char *xport_to_str(enum transport_type t) 
	switch (t) {

	case USB_GADGET_XPORT_TTY:

		return "TTY";

	case USB_GADGET_XPORT_SDIO:

		return "SDIO";

	case USB_GADGET_XPORT_SMD:

		return "SMD";

	case USB_GADGET_XPORT_QTI:
@@ -65,8 +62,6 @@ static enum transport_type str_to_xport(const char *name) 
{

	if (!strncasecmp("TTY", name, XPORT_STR_LEN))

		return USB_GADGET_XPORT_TTY;

	if (!strncasecmp("SDIO", name, XPORT_STR_LEN))

		return USB_GADGET_XPORT_SDIO;

	if (!strncasecmp("SMD", name, XPORT_STR_LEN))

		return USB_GADGET_XPORT_SMD;

	if (!strncasecmp("QTI", name, XPORT_STR_LEN))

drivers/usb/gadget/android.c

+0 −46
Original line number Diff line number Diff line
@@ -45,11 +45,8 @@ 
#include "f_diag.c"

#include "f_qdss.c"

#include "f_rmnet_smd.c"

#include "f_rmnet_sdio.c"

#include "f_rmnet_smd_sdio.c"

#include "f_rmnet.c"

#include "f_gps.c"

#include "u_sdio.c"

#include "u_smd.c"

#include "u_bam.c"

#include "u_rmnet_ctrl_smd.c"
@@ -773,47 +770,6 @@ static struct android_usb_function rmnet_smd_function = { 
	.bind_config	= rmnet_smd_function_bind_config,

};



/* RMNET_SDIO */

static int rmnet_sdio_function_bind_config(struct android_usb_function *f,

					  struct usb_configuration *c)

{

	return rmnet_sdio_function_add(c);

}



static struct android_usb_function rmnet_sdio_function = {

	.name		= "rmnet_sdio",

	.bind_config	= rmnet_sdio_function_bind_config,

};



/* RMNET_SMD_SDIO */

static int rmnet_smd_sdio_function_init(struct android_usb_function *f,

				 struct usb_composite_dev *cdev)

{

	return rmnet_smd_sdio_init();

}



static void rmnet_smd_sdio_function_cleanup(struct android_usb_function *f)

{

	rmnet_smd_sdio_cleanup();

}



static int rmnet_smd_sdio_bind_config(struct android_usb_function *f,

					  struct usb_configuration *c)

{

	return rmnet_smd_sdio_function_add(c);

}



static struct device_attribute *rmnet_smd_sdio_attributes[] = {

					&dev_attr_transport, NULL };



static struct android_usb_function rmnet_smd_sdio_function = {

	.name		= "rmnet_smd_sdio",

	.init		= rmnet_smd_sdio_function_init,

	.cleanup	= rmnet_smd_sdio_function_cleanup,

	.bind_config	= rmnet_smd_sdio_bind_config,

	.attributes	= rmnet_smd_sdio_attributes,

};



/*rmnet transport string format(per port):"ctrl0,data0,ctrl1,data1..." */

#define MAX_XPORT_STR_LEN 50

static char rmnet_transports[MAX_XPORT_STR_LEN];
@@ -2592,8 +2548,6 @@ static struct android_usb_function *supported_functions[] = { 
	&audio_function,

#endif

	&rmnet_smd_function,

	&rmnet_sdio_function,

	&rmnet_smd_sdio_function,

	&rmnet_function,

	&gps_function,

	&diag_function,

drivers/usb/gadget/f_acm.c

+2 −16
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct f_acm { 
};



static unsigned int no_acm_tty_ports;

static unsigned int no_acm_sdio_ports;

static unsigned int no_acm_smd_ports;

static unsigned int nr_acm_ports;

static unsigned int acm_next_free_port;
@@ -106,9 +105,8 @@ int acm_port_setup(struct usb_configuration *c) 
{

	int ret = 0, i;



	pr_debug("%s: no_acm_tty_ports:%u no_acm_sdio_ports: %u nr_acm_ports:%u\n",

			__func__, no_acm_tty_ports, no_acm_sdio_ports,

				nr_acm_ports);

	pr_debug("%s: no_acm_tty_ports:%u nr_acm_ports:%u\n",

			__func__, no_acm_tty_ports, nr_acm_ports);



	if (no_acm_tty_ports) {

		for (i = 0; i < no_acm_tty_ports; i++) {
@@ -118,8 +116,6 @@ int acm_port_setup(struct usb_configuration *c) 
				return ret;

		}

	}

	if (no_acm_sdio_ports)

		ret = gsdio_setup(c->cdev->gadget, no_acm_sdio_ports);

	if (no_acm_smd_ports)

		ret = gsmd_setup(c->cdev->gadget, no_acm_smd_ports);
@@ -149,9 +145,6 @@ static int acm_port_connect(struct f_acm *acm) 
	case USB_GADGET_XPORT_TTY:

		gserial_connect(&acm->port, port_num);

		break;

	case USB_GADGET_XPORT_SDIO:

		gsdio_connect(&acm->port, port_num);

		break;

	case USB_GADGET_XPORT_SMD:

		gsmd_connect(&acm->port, port_num);

		break;
@@ -178,9 +171,6 @@ static int acm_port_disconnect(struct f_acm *acm) 
	case USB_GADGET_XPORT_TTY:

		gserial_disconnect(&acm->port);

		break;

	case USB_GADGET_XPORT_SDIO:

		gsdio_disconnect(&acm->port, port_num);

		break;

	case USB_GADGET_XPORT_SMD:

		gsmd_disconnect(&acm->port, port_num);

		break;
@@ -1000,10 +990,6 @@ int acm_init_port(int port_num, const char *name) 
	case USB_GADGET_XPORT_TTY:

		no_acm_tty_ports++;

		break;

	case USB_GADGET_XPORT_SDIO:

		gacm_ports[port_num].client_port_num = no_acm_sdio_ports;

		no_acm_sdio_ports++;

		break;

	case USB_GADGET_XPORT_SMD:

		gacm_ports[port_num].client_port_num = no_acm_smd_ports;

		no_acm_smd_ports++;

drivers/usb/gadget/f_mbim.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
 */



#define MBIM_BULK_BUFFER_SIZE		4096

#define MAX_CTRL_PKT_SIZE		4096





enum mbim_peripheral_ep_type {

drivers/usb/gadget/f_rmnet_sdio.c

deleted100644 → 0
+0 −1576

File deleted.

Preview size limit exceeded, changes collapsed.