superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pci/misc' 

- Use max() instead of max_t() to ease static analysis (David Laight)

- Add Manivannan Sadhasivam as PCI/pwrctrl maintainer (Bartosz Golaszewski)

* pci/misc:
  MAINTAINERS: Add Manivannan Sadhasivam as PCI/pwrctrl maintainer
  PCI: Use max() instead of max_t() to ease static analysis
pull/1354/merge
Bjorn Helgaas 2025-12-03 14:18:46 -06:00
parent 9f1aa395ad 7eba05e79c
commit cd6b7c82b6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -19887,6 +19887,7 @@ F: include/linux/pci-p2pdma.h
PCI POWER CONTROL PCI POWER CONTROL
M: Bartosz Golaszewski <brgl@bgdev.pl> M: Bartosz Golaszewski <brgl@bgdev.pl>
M: Manivannan Sadhasivam <mani@kernel.org>
L: linux-pci@vger.kernel.org L: linux-pci@vger.kernel.org
S: Maintained S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git

3
drivers/pci/probe.c
View File

@ -3174,8 +3174,7 @@ static unsigned int pci_scan_child_bus_extend(struct pci_bus *bus,
* bus number if there is room. * bus number if there is room.
*/ */
if (bus->self && bus->self->is_hotplug_bridge) { if (bus->self && bus->self->is_hotplug_bridge) {
used_buses = max_t(unsigned int, available_buses, used_buses = max(available_buses, pci_hotplug_bus_size - 1);
pci_hotplug_bus_size - 1);
if (max - start < used_buses) { if (max - start < used_buses) {
max = start + used_buses; max = start + used_buses;