lkml.org 
[lkml]   [2014]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH v4 7/10] staging: gdm72xx: Removed commented-out code

    Removed commented-out code

    Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
    ---
    drivers/staging/gdm72xx/gdm_qos.h | 17 -----------------
    drivers/staging/gdm72xx/gdm_wimax.c | 4 ----
    drivers/staging/gdm72xx/gdm_wimax.h | 6 ------
    drivers/staging/gdm72xx/usb_boot.c | 17 +----------------
    4 files changed, 1 insertion(+), 43 deletions(-)

    diff --git a/drivers/staging/gdm72xx/gdm_qos.h b/drivers/staging/gdm72xx/gdm_qos.h
    index 8f18119..6543cff 100644
    --- a/drivers/staging/gdm72xx/gdm_qos.h
    +++ b/drivers/staging/gdm72xx/gdm_qos.h
    @@ -34,23 +34,6 @@
    #define IEEE802_1QVLANID 0x10

    struct gdm_wimax_csr_s {
    - /* union{
    - U16 all;
    - struct _CS_CLASSIFIER_RULE_ENABLE{
    - IPTypeOfService:1,
    - Protocol:1,
    - IPMaskedSrcAddress:1,
    - IPMaskedDstAddress:1,
    - ProtocolSrcPortRange:1,
    - ProtocolDstPortRange:1,
    - DstMacAddr:1,
    - SrcMacAddr:1,
    - Ethertype:1,
    - IEEE802_1DUserPriority:1,
    - IEEE802_1QVLANID:1,
    - Reserved:5;
    - } fields;
    - } */
    BOOLEAN enabled;
    u32 SFID;
    u8 qos_buf_count;
    diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c
    index 814d2e4..3ccb083 100644
    --- a/drivers/staging/gdm72xx/gdm_wimax.c
    +++ b/drivers/staging/gdm72xx/gdm_wimax.c
    @@ -862,10 +862,6 @@ static void prepare_rx_complete(void *arg, void *data, int len)
    netdev_err(nic->netdev,
    "get_prepared_info failed(%d)\n", ret);
    gdm_wimax_rcv_with_cb(nic, prepare_rx_complete, nic);
    - #if 0
    - /* Re-prepare WiMax device */
    - gdm_wimax_prepare_device(nic->netdev);
    - #endif
    }
    }

    diff --git a/drivers/staging/gdm72xx/gdm_wimax.h b/drivers/staging/gdm72xx/gdm_wimax.h
    index 3013bdb..55212f5 100644
    --- a/drivers/staging/gdm72xx/gdm_wimax.h
    +++ b/drivers/staging/gdm72xx/gdm_wimax.h
    @@ -23,10 +23,6 @@

    #define DRIVER_VERSION "3.2.3"

    -/*#define ETH_P_IP 0x0800 */
    -/*#define ETH_P_ARP 0x0806 */
    -/*#define ETH_P_IPV6 0x86DD */
    -
    #define H2L(x) __cpu_to_le16(x)
    #define L2H(x) __le16_to_cpu(x)
    #define DH2L(x) __cpu_to_le32(x)
    @@ -62,8 +58,6 @@ struct nic {

    };

    -/*#define LOOPBACK_TEST */
    -
    int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev);
    int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev);
    void unregister_wimax_device(struct phy_dev *phy_dev);
    diff --git a/drivers/staging/gdm72xx/usb_boot.c b/drivers/staging/gdm72xx/usb_boot.c
    index 0d45eb6..8518a5a 100644
    --- a/drivers/staging/gdm72xx/usb_boot.c
    +++ b/drivers/staging/gdm72xx/usb_boot.c
    @@ -169,14 +169,7 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
    memcpy(&hdr, firm->data, sizeof(hdr));

    array_le32_to_cpu((u32 *)&hdr, 19);
    -#if 0
    - if (hdr.magic_code != 0x10767fff) {
    - dev_err(&usbdev->dev, "Invalid magic code 0x%08x\n",
    - hdr.magic_code);
    - ret = -EINVAL;
    - goto out;
    - }
    -#endif
    +
    if (hdr.count > MAX_IMG_CNT) {
    dev_err(&usbdev->dev, "Too many images. %d\n", hdr.count);
    ret = -EINVAL;
    @@ -201,14 +194,6 @@ int usb_boot(struct usb_device *usbdev, u16 pid)
    memcpy(&fw_info, firm->data + pos, sizeof(fw_info));

    array_le32_to_cpu((u32 *)&fw_info, 8);
    -#if 0
    - if ((fw_info.id & 0xfffff000) != 0x10767000) {
    - dev_err(&usbdev->dev, "Invalid FW id. 0x%08x\n",
    - fw_info.id);
    - ret = -EIO;
    - goto out;
    - }
    -#endif

    if ((fw_info.id & 0xffff) != pid)
    continue;
    --
    1.8.4


    \
     
     \ /
      Last update: 2014-04-29 05:01    [W:2.681 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site