Commit 4191faa2 authored by David S. Miller's avatar David S. Miller

Merge branch 'skfp-cleanups'

Puranjay Mohan says:

====================
net: fddi: skfp: Use PCI generic definitions instead of private duplicates

This patch series removes the private duplicates of PCI definitions in
favour of generic definitions defined in pci_regs.h.

This driver only uses some of the generic PCI definitons,
which are included from pci_regs.h and thier private versions
are removed from skfbi.h with all other private defines.

The skfbi.h defines PCI_REV_ID and other private defines with different
names, these are renamed to Generic PCI names to make them
compatible with defines in pci_regs.h.

All unused defines are removed from skfbi.h.

Changes in v5:
Removed unused PCI definitions which were left in v4

Changes in v4:
Removed unused PCI definitions which were left in v3

Changes in v3:
Renamed all local PCI definitions to Generic names.
Corrected coding style mistakes.

Changes in v2:
Converted individual patches to a series.
Made sure that individual patches build correctly
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a8b79105 3ce7ee2c
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "h/supern_2.h" #include "h/supern_2.h"
#include "h/skfbiinc.h" #include "h/skfbiinc.h"
#include <linux/bitrev.h> #include <linux/bitrev.h>
#include <linux/pci_regs.h>
#ifndef lint #ifndef lint
static const char ID_sccs[] = "@(#)drvfbi.c 1.63 99/02/11 (C) SK " ; 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) ...@@ -127,7 +128,7 @@ static void card_start(struct s_smc *smc)
* at very first before any other initialization functions is * at very first before any other initialization functions is
* executed. * 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) { if ((rev_id & 0xf0) == SK_ML_ID_1 || (rev_id & 0xf0) == SK_ML_ID_2) {
smc->hw.hw_is_64bit = TRUE ; smc->hw.hw_is_64bit = TRUE ;
} else { } else {
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment