Merge "usb: gadget: Use smd_named_open_on_edge()" (f7507bd2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/f_rmnet_smd.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -896,8 +896,9 @@ static void rmnet_smd_connect_work(struct work_struct *w)
		int ret = 0;

		/* Control channel for QMI messages */
		ret = smd_open(rmnet_ctl_ch, &dev->smd_ctl.ch,
		&dev->smd_ctl, rmnet_smd_event_notify);
		ret = smd_named_open_on_edge(rmnet_ctl_ch, SMD_APPS_MODEM,
		&dev->smd_ctl.ch, &dev->smd_ctl,
		rmnet_smd_event_notify);
		if (ret) {
		ERROR(cdev, "Unable to open control smd channel: %d\n", ret);
		/*
		@@ -918,8 +919,9 @@ static void rmnet_smd_connect_work(struct work_struct *w)
		&dev->smd_ctl.flags));

		/* Data channel for network packets */
		ret = smd_open(rmnet_data_ch, &dev->smd_data.ch,
		&dev->smd_data, rmnet_smd_event_notify);
		ret = smd_named_open_on_edge(rmnet_data_ch, SMD_APPS_MODEM,
		&dev->smd_data.ch, &dev->smd_data,
		rmnet_smd_event_notify);
		if (ret) {
		ERROR(cdev, "Unable to open data smd channel\n");
		smd_close(dev->smd_ctl.ch);

+2 −2

Original line number	Diff line number	Diff line
		@@ -916,8 +916,8 @@ static int rmnet_mux_smd_enable(struct rmnet_mux_dev *dev)
		if (test_bit(RMNET_MUX_CH_OPENED, &smd_dev->smd_data.flags))
		goto smd_alloc_req;

		ret = smd_open(rmnet_mux_smd_data_ch, &smd_dev->smd_data.ch,
		dev, rmnet_mux_smd_notify);
		ret = smd_named_open_on_edge(rmnet_mux_smd_data_ch, SMD_APPS_MODEM,
		&smd_dev->smd_data.ch, dev, rmnet_mux_smd_notify);
		if (ret) {
		ERROR(cdev, "Unable to open data smd channel\n");
		return ret;

+2 −1

Original line number	Diff line number	Diff line
		@@ -385,7 +385,8 @@ static void grmnet_ctrl_smd_connect_w(struct work_struct *w)
		return;
		}

		ret = smd_open(c->name, &c->ch, port, grmnet_ctrl_smd_notify);
		ret = smd_named_open_on_edge(c->name, SMD_APPS_MODEM, &c->ch, port,
		grmnet_ctrl_smd_notify);
		if (ret) {
		if (ret == -EAGAIN) {
		/* port not ready - retry */