Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337815
b: refs/heads/master
c: c299647
h: refs/heads/master
i:
  337813: 151c761
  337811: 9fdee6e
  337807: c8a2c0f
v: v3
  • Loading branch information
Adil Mujeeb authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent c6c8d9b commit ca83169
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 15 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 466cd9f53016b1cfd7812bf1f95b40697c48ff06
refs/heads/master: c299647f0c045a82e0790332433d2df82da6115a
14 changes: 0 additions & 14 deletions trunk/drivers/staging/winbond/wbusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,15 @@ static int wbsoft_add_interface(struct ieee80211_hw *dev,
static void wbsoft_remove_interface(struct ieee80211_hw *dev,
struct ieee80211_vif *vif)
{
printk("wbsoft_remove interface called\n");
}

static void wbsoft_stop(struct ieee80211_hw *hw)
{
printk(KERN_INFO "%s called\n", __func__);
}

static int wbsoft_get_stats(struct ieee80211_hw *hw,
struct ieee80211_low_level_stats *stats)
{
printk(KERN_INFO "%s called\n", __func__);
return 0;
}

Expand Down Expand Up @@ -179,12 +176,9 @@ static void hal_set_current_channel_ex(struct hw_data *pHwData, struct chan_info
if (pHwData->SurpriseRemove)
return;

printk("Going to channel: %d/%d\n", channel.band, channel.ChanNo);

RFSynthesizer_SwitchingChannel(pHwData, channel); /* Switch channel */
pHwData->Channel = channel.ChanNo;
pHwData->band = channel.band;
pr_debug("Set channel is %d, band =%d\n", pHwData->Channel, pHwData->band);
reg->M28_MacControl &= ~0xff; /* Clean channel information field */
reg->M28_MacControl |= channel.ChanNo;
Wb35Reg_WriteWithCallbackValue(pHwData, 0x0828, reg->M28_MacControl,
Expand Down Expand Up @@ -264,8 +258,6 @@ static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)
struct wbsoft_priv *priv = dev->priv;
struct chan_info ch;

printk("wbsoft_config called\n");

/* Should use channel_num, or something, as that is already pre-translated */
ch.band = 1;
ch.ChanNo = 1;
Expand All @@ -282,7 +274,6 @@ static int wbsoft_config(struct ieee80211_hw *dev, u32 changed)

static u64 wbsoft_get_tsf(struct ieee80211_hw *dev, struct ieee80211_vif *vif)
{
printk("wbsoft_get_tsf called\n");
return 0;
}

Expand Down Expand Up @@ -716,7 +707,6 @@ static int wb35_hw_init(struct ieee80211_hw *hw)
}

priv->sLocalPara.bAntennaNo = hal_get_antenna_number(pHwData);
pr_debug("Driver init, antenna no = %d\n", priv->sLocalPara.bAntennaNo);
hal_get_hw_radio_off(pHwData);

/* Waiting for HAL setting OK */
Expand Down Expand Up @@ -782,9 +772,6 @@ static int wb35_probe(struct usb_interface *intf,
interface = intf->cur_altsetting;
endpoint = &interface->endpoint[0].desc;

if (endpoint[2].wMaxPacketSize == 512)
printk("[w35und] Working on USB 2.0\n");

err = wb35_hw_init(dev);
if (err)
goto error_free_hw;
Expand Down Expand Up @@ -836,7 +823,6 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter)
{
/* Turn off Rx and Tx hardware ability */
hal_stop(&adapter->sHwData);
pr_debug("[w35und] Hal_stop O.K.\n");
/* Waiting Irp completed */
msleep(100);

Expand Down

0 comments on commit ca83169

Please sign in to comment.