netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Guy, Wey-Yi" <wey-yi.w.guy@intel.com>
To: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
	"linville@tuxdriver.com" <linville@tuxdriver.com>,
	"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
	"ilw@linux.intel.com" <ilw@linux.intel.com>
Subject: Re: [PATCH 1/2] iwlwifi: use pci_dev->revision, again
Date: Thu, 23 Jun 2011 08:02:45 -0700	[thread overview]
Message-ID: <1308841365.13397.274.camel@wwguy-huron> (raw)
In-Reply-To: <201106231841.40691.sshtylyov@ru.mvista.com>

On Thu, 2011-06-23 at 07:41 -0700, Sergei Shtylyov wrote:
> Commit ff938e43d39e926de74b32a3656c190f979ab642 (net: use pci_dev->revision,
> again) already converted this driver to using the 'revision' field of 'struct
> pci_dev' but commit c2974a1d18832a9fffb2eb389c3878f5c4ed92f1 (iwlagn: remove
> rev_id) later reverted that change for no reason. Now restore the change...
> 
> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> 
> ---
> The patch is against the recent Linus' tree.
> 
>  drivers/net/wireless/iwlwifi/iwl-agn.c |    5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> Index: linux-2.6/drivers/net/wireless/iwlwifi/iwl-agn.c
> ===================================================================
> --- linux-2.6.orig/drivers/net/wireless/iwlwifi/iwl-agn.c
> +++ linux-2.6/drivers/net/wireless/iwlwifi/iwl-agn.c
> @@ -3275,10 +3275,9 @@ struct ieee80211_ops iwlagn_hw_ops = {
>  
>  static u32 iwl_hw_detect(struct iwl_priv *priv)
>  {
> -	u8 rev_id;
> +	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n",
> +		       priv->pci_dev->revision);
>  
> -	pci_read_config_byte(priv->pci_dev, PCI_REVISION_ID, &rev_id);
> -	IWL_DEBUG_INFO(priv, "HW Revision ID = 0x%X\n", rev_id);
>  	return iwl_read32(priv, CSR_HW_REV);
>  }
>  
hmm, I believe it is merge sequence issue, the IWL_DEBUG_INFO line has
benn remove all together in later patch. the information is being log in
the calling function, no need to log in "iwl_hw_detect"

Wey



  reply	other threads:[~2011-06-23 15:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-23 14:41 [PATCH 1/2] iwlwifi: use pci_dev->revision, again Sergei Shtylyov
2011-06-23 15:02 ` Guy, Wey-Yi [this message]
2011-06-24 10:44   ` Sergei Shtylyov
     [not found]     ` <4E046A9F.9020909-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org>
2011-06-24 14:08       ` wwguy
2011-06-24 14:37         ` Sergei Shtylyov
     [not found]           ` <4E04A143.1090204-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org>
2011-06-24 15:21             ` wwguy

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=1308841365.13397.274.camel@wwguy-huron \
    --to=wey-yi.w.guy@intel.com \
    --cc=ilw@linux.intel.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=netdev@vger.kernel.org \
    --cc=sshtylyov@ru.mvista.com \
    /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;
as well as URLs for NNTP newsgroup(s).