Merge branch 'pci/controller/generic'

bjorn-helgaas · bjorn-helgaas · commit 7d24571321b5 · 2026-02-06T17:09:48.000-06:00
- Reword 'reg' property error message to account for both missing and
  malformed properties (Jess)

* pci/controller/generic:
  PCI: host-generic: Avoid reporting incorrect 'missing reg property' error
diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
@@ -32,7 +32,7 @@ struct pci_config_window *pci_host_common_ecam_create(struct device *dev,
 
 	err = of_address_to_resource(dev->of_node, 0, &cfgres);
 	if (err) {
-		dev_err(dev, "missing \"reg\" property\n");
+		dev_err(dev, "missing or malformed \"reg\" property\n");
 		return ERR_PTR(err);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ struct pci_config_window pci_host_common_ecam_create(struct device dev,`
`32`	`32`
`33`	`33`	`err = of_address_to_resource(dev->of_node, 0, &cfgres);`
`34`	`34`	`if (err) {`
`35`		`- dev_err(dev, "missing \"reg\" property\n");`
	`35`	`+ dev_err(dev, "missing or malformed \"reg\" property\n");`
`36`	`36`	`return ERR_PTR(err);`
`37`	`37`	`}`
`38`	`38`