From: David S. Miller Date: Wed, 26 Jun 2019 20:05:42 +0000 (-0700) Subject: Merge branch 'skfp-cleanups' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4191faa25384afee063568437b0b255ef0c75237;p=linux.git 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: David S. Miller --- 4191faa25384afee063568437b0b255ef0c75237