Commit cd6b7c82 authored Dec 03, 2025 by Bjorn Helgaas

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

parents 9f1aa395 7eba05e7

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -19887,6 +19887,7 @@ F: include/linux/pci-p2pdma.h

		PCI POWER CONTROL
		M: Bartosz Golaszewski <brgl@bgdev.pl>
		M: Manivannan Sadhasivam <mani@kernel.org>
		L: linux-pci@vger.kernel.org
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git

drivers/pci/probe.c

+1 −2

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