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

Commit 8fb28061 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: split rtl8152_suspend function 



Split rtl8152_suspend() into rtl8152_system_suspend() and
rtl8152_rumtime_suspend().

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc647ec8

drivers/net/usb/r8152.c

+40 −17
Original line number Diff line number Diff line
@@ -3576,39 +3576,62 @@ static bool delay_autosuspend(struct r8152 *tp) 
		return false;

}



static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)

static int rtl8152_rumtime_suspend(struct r8152 *tp)

{

	struct r8152 *tp = usb_get_intfdata(intf);

	struct net_device *netdev = tp->netdev;

	int ret = 0;



	mutex_lock(&tp->control);



	if (PMSG_IS_AUTO(message)) {

		if (netif_running(netdev) && delay_autosuspend(tp)) {

	if (netif_running(netdev) && test_bit(WORK_ENABLE, &tp->flags)) {

		if (delay_autosuspend(tp)) {

			ret = -EBUSY;

			goto out1;

		}



		clear_bit(WORK_ENABLE, &tp->flags);

		usb_kill_urb(tp->intr_urb);

		napi_disable(&tp->napi);

		rtl_stop_rx(tp);

		tp->rtl_ops.autosuspend_en(tp, true);

		napi_enable(&tp->napi);

	}



	set_bit(SELECTIVE_SUSPEND, &tp->flags);

	} else {

		netif_device_detach(netdev);



out1:

	return ret;

}



static int rtl8152_system_suspend(struct r8152 *tp)

{

	struct net_device *netdev = tp->netdev;

	int ret = 0;



	netif_device_detach(netdev);



	if (netif_running(netdev) && test_bit(WORK_ENABLE, &tp->flags)) {

		clear_bit(WORK_ENABLE, &tp->flags);

		usb_kill_urb(tp->intr_urb);

		napi_disable(&tp->napi);

		if (test_bit(SELECTIVE_SUSPEND, &tp->flags)) {

			rtl_stop_rx(tp);

			tp->rtl_ops.autosuspend_en(tp, true);

		} else {

		cancel_delayed_work_sync(&tp->schedule);

		tp->rtl_ops.down(tp);

		}

		napi_enable(&tp->napi);

	}

out1:



	return ret;

}



static int rtl8152_suspend(struct usb_interface *intf, pm_message_t message)

{

	struct r8152 *tp = usb_get_intfdata(intf);

	int ret;



	mutex_lock(&tp->control);



	if (PMSG_IS_AUTO(message))

		ret = rtl8152_rumtime_suspend(tp);

	else

		ret = rtl8152_system_suspend(tp);



	mutex_unlock(&tp->control);



	return ret;