Merge branch 'pci/pciehp' into next

Browse source

* pci/pciehp:
  PCI: pciehp: Move Attention & Power Indicator support tests to accessors
  PCI: pciehp: Use symbolic constants for Slot Control fields
  PCI: pciehp: Use symbolic constants, not hard-coded bitmask
  PCI: pciehp: Simplify "Power Fault Detected" checking/clearing
  PCI: pciehp: Announce slot capabilities (slot #, button, LEDs, etc)
  PCI: pciehp: Make various functions void since they can't fail
  PCI: pciehp: Remove error checks when accessing PCIe Capability
  PCI: pciehp: Drop pciehp_readw()/pciehp_writew() wrappers

...

This commit is contained in:

Bjorn Helgaas 2013-12-18 14:04:29 -07:00

parent 765147f85a af9ab791e3

commit a737f76bae

6 changed files with 185 additions and 328 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

drivers/pci/hotplug/pciehp.h

View file

15

drivers/pci/hotplug/pciehp_core.c

View file

90

drivers/pci/hotplug/pciehp_ctrl.c

View file

380

drivers/pci/hotplug/pciehp_hpc.c

View file

6

drivers/pci/hotplug/pciehp_pci.c

View file

8

include/uapi/linux/pci_regs.h

View file