mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michalis Pappas <mpappas@fastmail.fm>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH] staging: gdm72xx: remove unused code
Date: Tue,  1 Jul 2014 14:00:14 +0100	[thread overview]
Message-ID: <1404219616-1788-1-git-send-email-mpappas@fastmail.fm> (raw)

Remove code surrounded by otherwise unused #define LOOPBACK_TEST

Signed-off-by: Michalis Pappas <mpappas@fastmail.fm>
---
 drivers/staging/gdm72xx/gdm_wimax.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/drivers/staging/gdm72xx/gdm_wimax.c b/drivers/staging/gdm72xx/gdm_wimax.c
index 4148013..c2e6bfe 100644
--- a/drivers/staging/gdm72xx/gdm_wimax.c
+++ b/drivers/staging/gdm72xx/gdm_wimax.c
@@ -368,8 +368,6 @@ int gdm_wimax_send_tx(struct sk_buff *skb, struct net_device *dev)
 static int gdm_wimax_tx(struct sk_buff *skb, struct net_device *dev)
 {
 	int ret = 0;
-	struct nic *nic = netdev_priv(dev);
-	struct fsm_s *fsm = (struct fsm_s *)nic->sdk_data[SIOC_DATA_FSM].buf;
 
 	dump_eth_packet(dev, "TX", skb->data, skb->len);
 
@@ -379,17 +377,6 @@ static int gdm_wimax_tx(struct sk_buff *skb, struct net_device *dev)
 		return ret;
 	}
 
-	#if !defined(LOOPBACK_TEST)
-	if (!fsm) {
-		netdev_err(dev, "ASSERTION ERROR: fsm is NULL!!\n");
-	} else if (fsm->m_status != M_CONNECTED) {
-		netdev_emerg(dev, "ASSERTION ERROR: Device is NOT ready. status=%d\n",
-			     fsm->m_status);
-		kfree_skb(skb);
-		return 0;
-	}
-	#endif
-
 #if defined(CONFIG_WIMAX_GDM72XX_QOS)
 	ret = gdm_qos_send_hci_pkt(skb, dev);
 #else
@@ -919,12 +906,7 @@ int register_wimax_device(struct phy_dev *phy_dev, struct device *pdev)
 	if (ret)
 		goto cleanup;
 
-	#if defined(LOOPBACK_TEST)
-	netif_start_queue(dev);
-	netif_carrier_on(dev);
-	#else
 	netif_carrier_off(dev);
-	#endif
 
 #ifdef CONFIG_WIMAX_GDM72XX_QOS
 	gdm_qos_init(nic);
-- 
1.8.4


             reply	other threads:[~2014-07-01 13:00 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-01 13:00 Michalis Pappas [this message]
2014-07-01 13:00 ` [PATCH] staging: gdm72xx: conditionally compile debug code Michalis Pappas
     [not found]   ` <CAC5Y2nPGyByqLEM1Go6Pxpb6MhiJy2Fvu=eEz6ak24gMhayk=A@mail.gmail.com>
2014-07-01 16:40     ` Michalis Pappas
     [not found]       ` <CAC5Y2nOvJ2=u7-T53kHd50AfQ7Mo_U4qvD_=si9=NSr_q0w3NA@mail.gmail.com>
2014-07-03 17:27         ` Michalis Pappas
2014-07-09 18:51   ` Greg KH
2014-07-09 19:52     ` Michalis Pappas
2014-07-09 20:24       ` Greg KH
2014-07-16 20:40     ` Michalis Pappas
2014-07-16 20:50       ` Greg KH
2014-07-16 22:03         ` Michalis Pappas
2014-07-16 22:10           ` Greg KH
2014-07-16 22:46             ` Joe Perches
2014-07-16 22:57               ` Greg KH
2014-07-17  0:19                 ` Joe Perches
2014-07-01 13:00 ` [PATCH] staging: gdm72xx: move T_CAPABILITY bit definitions to hci.h Michalis Pappas
2014-07-01 15:37   ` Ben Chan
2014-07-01 16:25     ` Michalis Pappas
2014-07-02 10:18   ` [PATCH V2] staging: gdm72xx: move T_CAPABILITY " Michalis Pappas
2014-07-09 10:26     ` Dan Carpenter
2014-07-09 18:24       ` Michalis Pappas
2014-07-09 18:31         ` [PATCH v3] " Michalis Pappas
2014-07-09 18:57           ` Greg KH
2014-07-09 19:21             ` [PATCH v4] " Michalis Pappas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1404219616-1788-1-git-send-email-mpappas@fastmail.fm \
    --to=mpappas@fastmail.fm \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®