From: Shuah Khan <skhan@linuxfoundation.org>
To: Puranjay Mohan <puranjay12@gmail.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bjorn@helgaas.com>,
linux-kernel-mentees@lists.linuxfoundation.org,
Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: [PATCH] net: fddi: skfp: Include generic PCI definitions from pci_regs.h
Date: Wed, 19 Jun 2019 12:04:19 -0600 [thread overview]
Message-ID: <e49daf89-1bf0-77e8-c71f-ec0802f25f6c@linuxfoundation.org> (raw)
In-Reply-To: <20190619174556.21194-1-puranjay12@gmail.com>
On 6/19/19 11:45 AM, Puranjay Mohan wrote:
> Include the generic PCI definitions from include/uapi/linux/pci_regs.h
> change PCI_REV_ID to PCI_REVISION_ID to make it compatible with the
> generic define.
> This driver uses only one generic PCI define.
>
> Signed-off-by: Puranjay Mohan <puranjay12@gmail.com>
> ---
> drivers/net/fddi/skfp/drvfbi.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/fddi/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c
> index bdd5700e71fa..38f6d943385d 100644
> --- a/drivers/net/fddi/skfp/drvfbi.c
> +++ b/drivers/net/fddi/skfp/drvfbi.c
> @@ -20,6 +20,7 @@
> #include "h/supern_2.h"
> #include "h/skfbiinc.h"
> #include <linux/bitrev.h>
> +#include <uapi/linux/pci_regs.h>
>
> #ifndef lint
> static const char ID_sccs[] = "@(#)drvfbi.c 1.63 99/02/11 (C) SK " ;
> @@ -127,7 +128,7 @@ static void card_start(struct s_smc *smc)
> * at very first before any other initialization functions is
> * executed.
> */
> - rev_id = inp(PCI_C(PCI_REV_ID)) ;
> + rev_id = inp(PCI_C(PCI_REVISION_ID)) ;
> if ((rev_id & 0xf0) == SK_ML_ID_1 || (rev_id & 0xf0) == SK_ML_ID_2) {
> smc->hw.hw_is_64bit = TRUE ;
> } else {
>
Why not delete the PCI_REV_ID define in:
drivers/net/fddi/skfp/h/skfbi.h
It looks like this header has duplicate PCI config space header defines,
not just this one. Some of them are slightly different names:
e.g:
#define PCI_CACHE_LSZ 0x0c /* 8 bit Cache Line Size */
Looks like it defines the standard PCI config space instead of
including and using the standard defines from uapi/linux/pci_regs.h
Something to look into.
thanks,
-- Shuah
next prev parent reply other threads:[~2019-06-19 18:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-19 17:45 [PATCH] net: fddi: skfp: Include generic PCI definitions from pci_regs.h Puranjay Mohan
2019-06-19 18:04 ` Shuah Khan [this message]
[not found] ` <20190619182122.GA4827@arch>
2019-06-19 18:31 ` Fwd: " Puranjay Mohan
2019-06-19 18:46 ` Shuah Khan
2019-06-19 19:18 ` Bjorn Helgaas
2019-06-19 21:12 ` David Miller
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=e49daf89-1bf0-77e8-c71f-ec0802f25f6c@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=bjorn@helgaas.com \
--cc=linux-kernel-mentees@lists.linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=puranjay12@gmail.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).