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

Commit a5e40708 authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

use generic usbnet_manage_power() 



This covers the drivers that can use a primitive
implementation.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2dd7c8cf

drivers/net/usb/cdc_ether.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -457,12 +457,6 @@ int usbnet_cdc_bind(struct usbnet *dev, struct usb_interface *intf) 
}

}

EXPORT_SYMBOL_GPL(usbnet_cdc_bind);

EXPORT_SYMBOL_GPL(usbnet_cdc_bind);





static int cdc_manage_power(struct usbnet *dev, int on)

{

	dev->intf->needs_remote_wakeup = on;

	return 0;

}



static const struct driver_info	cdc_info = {

static const struct driver_info	cdc_info = {

	.description =	"CDC Ethernet Device",

	.description =	"CDC Ethernet Device",

	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT,

	.flags =	FLAG_ETHER | FLAG_POINTTOPOINT,
@@ -470,7 +464,7 @@ static const struct driver_info cdc_info = { 
	.bind =		usbnet_cdc_bind,

	.bind =		usbnet_cdc_bind,

	.unbind =	usbnet_cdc_unbind,

	.unbind =	usbnet_cdc_unbind,

	.status =	usbnet_cdc_status,

	.status =	usbnet_cdc_status,

	.manage_power =	cdc_manage_power,

	.manage_power =	usbnet_manage_power,

};

};





static const struct driver_info wwan_info = {

static const struct driver_info wwan_info = {
@@ -479,7 +473,7 @@ static const struct driver_info wwan_info = { 
	.bind =		usbnet_cdc_bind,

	.bind =		usbnet_cdc_bind,

	.unbind =	usbnet_cdc_unbind,

	.unbind =	usbnet_cdc_unbind,

	.status =	usbnet_cdc_status,

	.status =	usbnet_cdc_status,

	.manage_power =	cdc_manage_power,

	.manage_power =	usbnet_manage_power,

};

};





/*-------------------------------------------------------------------------*/

/*-------------------------------------------------------------------------*/

drivers/net/usb/cdc_ncm.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -1129,19 +1129,13 @@ static void cdc_ncm_disconnect(struct usb_interface *intf) 
	usbnet_disconnect(intf);

	usbnet_disconnect(intf);

}

}





static int cdc_ncm_manage_power(struct usbnet *dev, int status)

{

	dev->intf->needs_remote_wakeup = status;

	return 0;

}



static const struct driver_info cdc_ncm_info = {

static const struct driver_info cdc_ncm_info = {

	.description = "CDC NCM",

	.description = "CDC NCM",

	.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET,

	.flags = FLAG_POINTTOPOINT | FLAG_NO_SETINT | FLAG_MULTI_PACKET,

	.bind = cdc_ncm_bind,

	.bind = cdc_ncm_bind,

	.unbind = cdc_ncm_unbind,

	.unbind = cdc_ncm_unbind,

	.check_connect = cdc_ncm_check_connect,

	.check_connect = cdc_ncm_check_connect,

	.manage_power = cdc_ncm_manage_power,

	.manage_power = usbnet_manage_power,

	.status = cdc_ncm_status,

	.status = cdc_ncm_status,

	.rx_fixup = cdc_ncm_rx_fixup,

	.rx_fixup = cdc_ncm_rx_fixup,

	.tx_fixup = cdc_ncm_tx_fixup,

	.tx_fixup = cdc_ncm_tx_fixup,
@@ -1155,7 +1149,7 @@ static const struct driver_info wwan_info = { 
	.bind = cdc_ncm_bind,

	.bind = cdc_ncm_bind,

	.unbind = cdc_ncm_unbind,

	.unbind = cdc_ncm_unbind,

	.check_connect = cdc_ncm_check_connect,

	.check_connect = cdc_ncm_check_connect,

	.manage_power = cdc_ncm_manage_power,

	.manage_power = usbnet_manage_power,

	.status = cdc_ncm_status,

	.status = cdc_ncm_status,

	.rx_fixup = cdc_ncm_rx_fixup,

	.rx_fixup = cdc_ncm_rx_fixup,

	.tx_fixup = cdc_ncm_tx_fixup,

	.tx_fixup = cdc_ncm_tx_fixup,