linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] brcm80211: remove some truely barftastic code
@ 2012-10-11 16:25 Alan Cox
  2012-10-11 16:25 ` [PATCH 2/2] ath9k: Fix broken conditional Alan Cox
  2012-10-11 16:33 ` [PATCH 1/2] brcm80211: remove some truely barftastic code Franky Lin
  0 siblings, 2 replies; 4+ messages in thread
From: Alan Cox @ 2012-10-11 16:25 UTC (permalink / raw)
  To: linux-wireless

From: Alan Cox <alan@linux.intel.com>

It's not used or called but please make it go away before someone copies or
uses it

Signed-off-by: Alan "minus lunch" Cox <alan@linux.intel.com>
---

 drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |    4 --
 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |   36 --------------------
 2 files changed, 40 deletions(-)


diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 17e7ae7..0510960 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -702,10 +702,6 @@ extern char *brcmf_ifname(struct brcmf_pub *drvr, int idx);
 extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,
 				       uint cmd, void *buf, uint len);
 
-#ifdef DEBUG
-extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);
-#endif				/* DEBUG */
-
 extern int brcmf_ifname2idx(struct brcmf_pub *drvr, char *name);
 extern int brcmf_c_host_event(struct brcmf_pub *drvr, int *idx,
 			      void *pktdata, struct brcmf_event_msg *,
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index d7c76ce..c462263 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -1163,42 +1163,6 @@ int brcmf_netdev_wait_pend8021x(struct net_device *ndev)
 	return pend;
 }
 
-#ifdef DEBUG
-int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size)
-{
-	int ret = 0;
-	struct file *fp;
-	mm_segment_t old_fs;
-	loff_t pos = 0;
-
-	/* change to KERNEL_DS address limit */
-	old_fs = get_fs();
-	set_fs(KERNEL_DS);
-
-	/* open file to write */
-	fp = filp_open("/tmp/mem_dump", O_WRONLY | O_CREAT, 0640);
-	if (!fp) {
-		brcmf_dbg(ERROR, "open file error\n");
-		ret = -1;
-		goto exit;
-	}
-
-	/* Write buf to file */
-	fp->f_op->write(fp, (char __user *)buf, size, &pos);
-
-exit:
-	/* free buf before return */
-	kfree(buf);
-	/* close file before return */
-	if (fp)
-		filp_close(fp, NULL);
-	/* restore previous address limit */
-	set_fs(old_fs);
-
-	return ret;
-}
-#endif				/* DEBUG */
-
 static void brcmf_driver_init(struct work_struct *work)
 {
 	brcmf_debugfs_init();


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] ath9k: Fix broken conditional
  2012-10-11 16:25 [PATCH 1/2] brcm80211: remove some truely barftastic code Alan Cox
@ 2012-10-11 16:25 ` Alan Cox
  2012-10-12  4:59   ` Mohammed Shafi
  2012-10-11 16:33 ` [PATCH 1/2] brcm80211: remove some truely barftastic code Franky Lin
  1 sibling, 1 reply; 4+ messages in thread
From: Alan Cox @ 2012-10-11 16:25 UTC (permalink / raw)
  To: linux-wireless

From: Alan Cox <alan@linux.intel.com>

One stray semicolon...

Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 5bbe505..189aeb2 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -2989,7 +2989,7 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
 	case EEP_PAPRD:
 		if (AR_SREV_9462(ah))
 			return false;
-		if (!ah->config.enable_paprd);
+		if (!ah->config.enable_paprd)
 			return false;
 		return !!(pBase->featureEnable & BIT(5));
 	case EEP_CHAIN_MASK_REDUCE:


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 1/2] brcm80211: remove some truely barftastic code
  2012-10-11 16:25 [PATCH 1/2] brcm80211: remove some truely barftastic code Alan Cox
  2012-10-11 16:25 ` [PATCH 2/2] ath9k: Fix broken conditional Alan Cox
@ 2012-10-11 16:33 ` Franky Lin
  1 sibling, 0 replies; 4+ messages in thread
From: Franky Lin @ 2012-10-11 16:33 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-wireless

On 10/11/2012 09:25 AM, Alan Cox wrote:
> From: Alan Cox <alan@linux.intel.com>
>
> It's not used or called but please make it go away before someone copies or
> uses it
>
> Signed-off-by: Alan "minus lunch" Cox <alan@linux.intel.com>

Indeed this should go away. Thanks!

Acked-by: Franky Lin <frankyl@broadcom.com>


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 2/2] ath9k: Fix broken conditional
  2012-10-11 16:25 ` [PATCH 2/2] ath9k: Fix broken conditional Alan Cox
@ 2012-10-12  4:59   ` Mohammed Shafi
  0 siblings, 0 replies; 4+ messages in thread
From: Mohammed Shafi @ 2012-10-12  4:59 UTC (permalink / raw)
  To: Alan Cox; +Cc: linux-wireless

Hi Alan Cox,

On Thu, Oct 11, 2012 at 9:55 PM, Alan Cox <alan@lxorguk.ukuu.org.uk> wrote:
> From: Alan Cox <alan@linux.intel.com>
>
> One stray semicolon...

seems to be fixed by
https://patchwork.kernel.org/patch/1529211/
but I don't think it was there in wireless-testing.

>
> Signed-off-by: Alan Cox <alan@linux.intel.com>
> ---
>
>  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
>
> diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> index 5bbe505..189aeb2 100644
> --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
> @@ -2989,7 +2989,7 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
>         case EEP_PAPRD:
>                 if (AR_SREV_9462(ah))
>                         return false;
> -               if (!ah->config.enable_paprd);
> +               if (!ah->config.enable_paprd)
>                         return false;
>                 return !!(pBase->featureEnable & BIT(5));
>         case EEP_CHAIN_MASK_REDUCE:
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
thanks,
shafi

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-10-12  4:59 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-11 16:25 [PATCH 1/2] brcm80211: remove some truely barftastic code Alan Cox
2012-10-11 16:25 ` [PATCH 2/2] ath9k: Fix broken conditional Alan Cox
2012-10-12  4:59   ` Mohammed Shafi
2012-10-11 16:33 ` [PATCH 1/2] brcm80211: remove some truely barftastic code Franky Lin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).