Commit 8627995c authored by Tim Collier's avatar Tim Collier Committed by Greg Kroah-Hartman

staging: wlan-ng: remove redundant code in "#if 0" blocks

Remove two blocks of code that checkpatch identified as redundant
because they were enclosed in "#if...#endif". In the case of
prism2fw.c the associated "TODO" comment was retained.
Signed-off-by: default avatarTim Collier <osdevtc@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 205d34e9
...@@ -927,10 +927,6 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc) ...@@ -927,10 +927,6 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)
/* Classify frame, increment counter */ /* Classify frame, increment counter */
ftype = WLAN_GET_FC_FTYPE(fc); ftype = WLAN_GET_FC_FTYPE(fc);
fstype = WLAN_GET_FC_FSTYPE(fc); fstype = WLAN_GET_FC_FSTYPE(fc);
#if 0
netdev_dbg(wlandev->netdev, "rx_typedrop : ftype=%d fstype=%d.\n",
ftype, fstype);
#endif
switch (ftype) { switch (ftype) {
case WLAN_FTYPE_MGMT: case WLAN_FTYPE_MGMT:
if ((wlandev->netdev->flags & IFF_PROMISC) || if ((wlandev->netdev->flags & IFF_PROMISC) ||
......
...@@ -706,7 +706,7 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks, ...@@ -706,7 +706,7 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
pr_warn("warning: Failed to find PDR for plugrec 0x%04x.\n", pr_warn("warning: Failed to find PDR for plugrec 0x%04x.\n",
s3plug[i].itemcode); s3plug[i].itemcode);
continue; /* and move on to the next PDR */ continue; /* and move on to the next PDR */
#if 0
/* MSM: They swear that unless it's the MAC address, /* MSM: They swear that unless it's the MAC address,
* the serial number, or the TX calibration records, * the serial number, or the TX calibration records,
* then there's reasonable defaults in the f/w * then there's reasonable defaults in the f/w
...@@ -714,9 +714,6 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks, ...@@ -714,9 +714,6 @@ static int plugimage(struct imgchunk *fchunk, unsigned int nfchunks,
* should only be a warning, not fatal. * should only be a warning, not fatal.
* TODO: add fatals for the PDRs mentioned above. * TODO: add fatals for the PDRs mentioned above.
*/ */
result = 1;
continue;
#endif
} }
/* Validate plug len against PDR len */ /* Validate plug len against PDR len */
......
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