Revert "Apply samsung patch to reduce l2_hsic wake lock." (e87cb6a1) · Commits · e / devices / android_kernel_samsung_smdk4412

drivers/misc/modem_if/modem_link_device_hsic.c

+3 −19

Original line number	Diff line number	Diff line
		@@ -88,12 +88,6 @@ retry:

		pm_runtime_get_sync(dev);

		if (ld->mc->phone_state != STATE_ONLINE) {
		mif_err("[MODEM_IF] MODEM is not online, skip start ipc\n");
		err = -ENODEV;
		goto exit;
		}

		mif_err("send 'a'\n");

		skb = alloc_skb(16, GFP_ATOMIC);
		@@ -710,17 +704,11 @@ static void link_pm_reconnect_work(struct work_struct *work)
		link_reconnect_work.work);
		struct modem_ctl *mc = if_usb_get_modemctl(pm_data);

		mif_info("\n");

		if (!mc \|\| pm_data->usb_ld->if_usb_connected) {
		mif_err("mc or if_usb_connected is invalid\n");
		if (!mc \|\| pm_data->usb_ld->if_usb_connected)
		return;
		}

		if (pm_data->usb_ld->ld.com_state != COM_ONLINE) {
		mif_err("com_state is not COM_ONLINE\n");
		if (pm_data->usb_ld->ld.com_state != COM_ONLINE)
		return;
		}

		if (pm_data->link_reconnect_cnt--) {
		if (mc->phone_state == STATE_ONLINE &&
		@@ -980,7 +968,6 @@ static int link_pm_notifier_event(struct notifier_block *this,
		{
		struct link_pm_data *pm_data =
		container_of(this, struct link_pm_data, pm_notifier);
		struct usb_device *usbdev = pm_data->usb_ld->usbdev;
		struct modem_ctl *mc = if_usb_get_modemctl(pm_data);

		switch (event) {
		@@ -1351,10 +1338,8 @@ static int __devinit if_usb_probe(struct usb_interface *intf,
		}

		/* HSIC main comm channel has been established */
		if (pipe == IF_USB_CMD_EP) {
		if (pipe == IF_USB_CMD_EP)
		link_pm_change_modem_state(usb_ld->link_pm_data, STATE_ONLINE);
		enable_irq(usb_ld->link_pm_data->irq_link_hostwake);
		}

		if (pipe == IF_USB_CMD_EP \|\| info->intf_id == BOOT_DOWN)
		usb_ld->if_usb_connected = 1;
		@@ -1513,7 +1498,6 @@ static int usb_link_pm_init(struct usb_link_device usb_ld, void data)
		mif_err("failed to enable_irq_wake:%d\n", r);
		goto err_set_wake_irq;
		}
		disable_irq(pm_data->irq_link_hostwake);

		/* create work queue & init work for runtime pm */
		pm_data->wq = create_singlethread_workqueue("linkpmd");

drivers/misc/modem_if/modem_link_device_usb.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -508,7 +508,7 @@ static void wait_enumeration_work(struct work_struct *work)
		struct usb_link_device, wait_enumeration.work);
		if (usb_ld->if_usb_connected == 0) {
		mif_err("USB disconnected and not enumerated for long time\n");
		usb_change_modem_state(usb_ld, STATE_CRASH_RESET);
		usb_change_modem_state(usb_ld, STATE_CRASH_EXIT);
		}
		}

		@@ -629,8 +629,6 @@ static void if_usb_disconnect(struct usb_interface *intf)
		cancel_delayed_work_sync(&usb_ld->ld.tx_delayed_work);
		usb_put_dev(usbdev);
		usb_ld->usbdev = NULL;
		schedule_delayed_work(&usb_ld->wait_enumeration,
		msecs_to_jiffies(40000));
		if (!has_hub(usb_ld)) {
		if (pm_data->root_hub)
		pm_runtime_forbid(pm_data->root_hub);
		@@ -789,6 +787,7 @@ static int __devinit if_usb_probe(struct usb_interface *intf,
		/* Queue work if skbs were pending before a disconnect/probe */
		if (ld->sk_fmt_tx_q.qlen \|\| ld->sk_raw_tx_q.qlen)
		queue_delayed_work(ld->tx_wq, &ld->tx_delayed_work, 0);

		usb_ld->if_usb_connected = 1;
		/USB3503/
		mif_debug("hub active complete\n");

drivers/misc/modem_if/modem_modemctl_device_cbp71.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -151,20 +151,6 @@ static int cbp71_boot_off(struct modem_ctl *mc)
		return 0;
		}

		static int cbp71_force_crash_exit(struct modem_ctl *mc)
		{
		struct link_device *ld = get_current_link(mc->iod);
		struct dpram_link_device *dpld = to_dpram_link_device(ld);

		mif_err("force_crash_exit\n");
		mif_err("<%s>\n", mc->bootd->name);

		dpld->dpctl->send_intr(INT_CMD(INT_CMD_ERR_DISPLAY));
		mc->iod->modem_state_changed(mc->iod, STATE_CRASH_EXIT);

		return 0;
		}

		static irqreturn_t phone_active_irq_handler(int irq, void *_mc)
		{
		int phone_reset = 0;
		@@ -207,7 +193,6 @@ static void cbp71_get_ops(struct modem_ctl *mc)
		mc->ops.modem_reset = cbp71_reset;
		mc->ops.modem_boot_on = cbp71_boot_on;
		mc->ops.modem_boot_off = cbp71_boot_off;
		mc->ops.modem_force_crash_exit = cbp71_force_crash_exit;
		}

		int cbp71_init_modemctl_device(struct modem_ctl *mc,

drivers/misc/modem_if/sipc4_io_device.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1384,7 +1384,6 @@ static int vnet_xmit(struct sk_buff skb, struct net_device ndev)
		struct io_device *iod = vnet->iod;
		struct link_device *ld = get_current_link(iod);
		struct raw_hdr hd;
		unsigned long tx_bytes = skb->len;
		struct iphdr *ip_header = NULL;

		/* When use `handover' with Network Bridge,
		@@ -1441,7 +1440,7 @@ static int vnet_xmit(struct sk_buff skb, struct net_device ndev)
		}

		ndev->stats.tx_packets++;
		ndev->stats.tx_bytes += tx_bytes;
		ndev->stats.tx_bytes += skb->len;

		return NETDEV_TX_OK;
		}