diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2025-12-03 14:18:46 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2025-12-03 14:18:46 -0600 |
| commit | cd6b7c82b69139070ee1aaa73f768ecac99e4c3e (patch) | |
| tree | 592dafaf3a6b75317dee92db9e20a426e0022a7b | |
| parent | 9f1aa395ad7889685ce7ea69a1a5badfacfce5e4 (diff) | |
| parent | 7eba05e79ca20b7169bf25da1e6cac1d31269f90 (diff) | |
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
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/pci/probe.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7937dce4a1e4..39f0f201621b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 7da9a431e1cc..e8588b8dd1c0 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -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; |