Skip to content
  • Bjorn Helgaas's avatar
    bac9789e
    Merge branch 'remotes/lorenzo/pci/rcar' · bac9789e
    Bjorn Helgaas authored
      - 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
    bac9789e
    Merge branch 'remotes/lorenzo/pci/rcar'
    Bjorn Helgaas authored
      - 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
Loading