diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-14 02:34:42 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-05-14 02:34:42 +0300 |
| commit | bac9789e535a6353854e19532d1db3d5580cb58c (patch) | |
| tree | dca23a91c9a021bc4a9015d33fd0b63f9ff927a1 /drivers/pci/pci.c | |
| parent | fb8a85fabdc83cfabfd30f79e6b15135e88d16f9 (diff) | |
| parent | a27beb5820d1a52b1e2863a4ae5545a1dd4ab35a (diff) | |
| download | linux-bac9789e535a6353854e19532d1db3d5580cb58c.tar.xz | |
Merge branch 'remotes/lorenzo/pci/rcar'
- Use BIT() when appropriate in rcar (Marek Vasut)
- Use u32 to match rcar hardware register widths (Marek Vasut)
- Use BITS_PER_BYTE when appropriate in rcar (Marek Vasut)
- Remove unnecessary casts in rcar (Marek Vasut)
- Fix 64-bit MSI target addresses in rcar (Marek Vasut)
- Check for __get_free_pages() failure in rcar (Kangjie Lu)
- Fix shadowed rcar "irq" variable (Wolfram Sang)
* remotes/lorenzo/pci/rcar:
PCI: rcar: Do not shadow the 'irq' variable
PCI: rcar: Fix a potential NULL pointer dereference
PCI: rcar: Fix 64bit MSI message address handling
PCI: rcar: Clean up debug messages
PCI: rcar: Replace (8 * n) with (BITS_PER_BYTE * n)
PCI: rcar: Replace various variable types with unsigned ones for register values
PCI: rcar: Replace unsigned long with u32/unsigned int in register accessors
PCI: rcar: Clean up remaining macros defining bits
# Conflicts:
# drivers/pci/controller/pcie-rcar.c
Diffstat (limited to 'drivers/pci/pci.c')
0 files changed, 0 insertions, 0 deletions