Commit 269027e9 authored by Matthias Beyer's avatar Matthias Beyer Committed by Greg Kroah-Hartman

Staging: bcm: Shortened some lines in select_alternate_setting_for_highspeed_modem()

Signed-off-by: default avatarMatthias Beyer <mail@beyermatthias.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3110cd8
...@@ -389,14 +389,12 @@ static int select_alternate_setting_for_highspeed_modem( ...@@ -389,14 +389,12 @@ static int select_alternate_setting_for_highspeed_modem(
retval = usb_set_interface(psIntfAdapter->udev, retval = usb_set_interface(psIntfAdapter->udev,
DEFAULT_SETTING_0, DEFAULT_SETTING_0,
ALTERNATE_SETTING_1); ALTERNATE_SETTING_1);
BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
DBG_LVL_ALL,
"BCM16 is applicable on this dongle\n"); "BCM16 is applicable on this dongle\n");
if (retval || !psIntfAdapter->bHighSpeedDevice) { if (retval || !psIntfAdapter->bHighSpeedDevice) {
*usedIntOutForBulkTransfer = EP2; *usedIntOutForBulkTransfer = EP2;
*endpoint = &iface_desc->endpoint[EP2].desc; *endpoint = &iface_desc->endpoint[EP2].desc;
BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
DRV_ENTRY, DBG_LVL_ALL,
"Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n"); "Interface altsetting failed or modem is configured to Full Speed, hence will work on default setting 0\n");
/* /*
* If Modem is high speed device EP2 should be * If Modem is high speed device EP2 should be
...@@ -409,8 +407,8 @@ static int select_alternate_setting_for_highspeed_modem( ...@@ -409,8 +407,8 @@ static int select_alternate_setting_for_highspeed_modem(
!usb_endpoint_is_int_out(*endpoint)) || !usb_endpoint_is_int_out(*endpoint)) ||
(!psIntfAdapter->bHighSpeedDevice && (!psIntfAdapter->bHighSpeedDevice &&
!usb_endpoint_is_bulk_out(*endpoint))) { !usb_endpoint_is_bulk_out(*endpoint))) {
BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY,
DRV_ENTRY, DBG_LVL_ALL, DBG_LVL_ALL,
"Configuring the EEPROM\n"); "Configuring the EEPROM\n");
/* change the EP2, EP4 to INT OUT end point */ /* change the EP2, EP4 to INT OUT end point */
ConfigureEndPointTypesThroughEEPROM( ConfigureEndPointTypesThroughEEPROM(
...@@ -422,13 +420,10 @@ static int select_alternate_setting_for_highspeed_modem( ...@@ -422,13 +420,10 @@ static int select_alternate_setting_for_highspeed_modem(
* will show fail and re-enumerate the * will show fail and re-enumerate the
* device * device
*/ */
retval = usb_reset_device( retval = usb_reset_device(psIntfAdapter->udev);
psIntfAdapter->udev);
if (retval) { if (retval) {
BCM_DEBUG_PRINT(psAd, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT,
DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
DRV_ENTRY,
DBG_LVL_ALL,
"reset failed. Re-enumerating the device.\n"); "reset failed. Re-enumerating the device.\n");
return retval; return retval;
} }
...@@ -438,26 +433,23 @@ static int select_alternate_setting_for_highspeed_modem( ...@@ -438,26 +433,23 @@ static int select_alternate_setting_for_highspeed_modem(
usb_endpoint_is_bulk_out(*endpoint)) { usb_endpoint_is_bulk_out(*endpoint)) {
/* Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail. */ /* Once BULK is selected in FS mode. Revert it back to INT. Else USB_IF will fail. */
UINT _uiData = ntohl(EP2_CFG_INT); UINT _uiData = ntohl(EP2_CFG_INT);
BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY,
DRV_ENTRY, DBG_LVL_ALL, DBG_LVL_ALL,
"Reverting Bulk to INT as it is in Full Speed mode.\n"); "Reverting Bulk to INT as it is in Full Speed mode.\n");
BeceemEEPROMBulkWrite(psAd, BeceemEEPROMBulkWrite(psAd, (PUCHAR) & _uiData, 0x136,
(PUCHAR) & _uiData, 4, TRUE);
0x136, 4, TRUE);
} }
} else { } else {
*usedIntOutForBulkTransfer = EP4; *usedIntOutForBulkTransfer = EP4;
*endpoint = &iface_desc->endpoint[EP4].desc; *endpoint = &iface_desc->endpoint[EP4].desc;
BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
DRV_ENTRY, DBG_LVL_ALL,
"Choosing AltSetting as a default setting.\n"); "Choosing AltSetting as a default setting.\n");
if (!usb_endpoint_is_int_out(*endpoint)) { if (!usb_endpoint_is_int_out(*endpoint)) {
BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT, DRV_ENTRY,
DRV_ENTRY, DBG_LVL_ALL, DBG_LVL_ALL,
"Dongle does not have BCM16 Fix.\n"); "Dongle does not have BCM16 Fix.\n");
/* change the EP2, EP4 to INT OUT end point and use EP4 in altsetting */ /* change the EP2, EP4 to INT OUT end point and use EP4 in altsetting */
ConfigureEndPointTypesThroughEEPROM( ConfigureEndPointTypesThroughEEPROM(psAd);
psAd);
/* /*
* It resets the device and if any thing * It resets the device and if any thing
...@@ -465,13 +457,10 @@ static int select_alternate_setting_for_highspeed_modem( ...@@ -465,13 +457,10 @@ static int select_alternate_setting_for_highspeed_modem(
* will show fail and re-enumerate the * will show fail and re-enumerate the
* device * device
*/ */
retval = usb_reset_device( retval = usb_reset_device(psIntfAdapter->udev);
psIntfAdapter->udev);
if (retval) { if (retval) {
BCM_DEBUG_PRINT(psAd, BCM_DEBUG_PRINT(psAd, DBG_TYPE_INITEXIT,
DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,
DRV_ENTRY,
DBG_LVL_ALL,
"reset failed. Re-enumerating the device.\n"); "reset failed. Re-enumerating the device.\n");
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment