diff options
author | Rob Herring <robh@kernel.org> | 2018-08-29 14:34:40 -0400 |
---|---|---|
committer | Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> | 2018-09-25 04:40:03 -0400 |
commit | de17c5200237e93a2de1188e5cf885686ac8f79d (patch) | |
tree | 5c3d9c9cbf10fb5a3712095b8dd28b951481b3e2 /drivers/pci/controller/pci-host-common.c | |
parent | 7876320f88802b22d4e2daf7eb027dd14175a0f8 (diff) |
PCI: Remove unnecessary check of device_type == pci
PCI host drivers have already matched on compatible strings, so checking
device_type is redundant. Also, device_type is considered deprecated for
FDT though we've still been requiring it for PCI hosts as it is useful
for finding PCI buses.
Signed-off-by: Rob Herring <robh@kernel.org>
[lorenzo.pieralisi@arm.com: reformatted the log]
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: Alan Douglas <adouglas@cadence.com>
Acked-by: Subrahmaya Lingappa <l.subrahmanya@mobiveil.co.in>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Alan Douglas <adouglas@cadence.com>
Cc: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: linux-pci@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Diffstat (limited to 'drivers/pci/controller/pci-host-common.c')
-rw-r--r-- | drivers/pci/controller/pci-host-common.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c index d8f10451f273..c742881b5061 100644 --- a/drivers/pci/controller/pci-host-common.c +++ b/drivers/pci/controller/pci-host-common.c | |||
@@ -58,9 +58,7 @@ err_out: | |||
58 | int pci_host_common_probe(struct platform_device *pdev, | 58 | int pci_host_common_probe(struct platform_device *pdev, |
59 | struct pci_ecam_ops *ops) | 59 | struct pci_ecam_ops *ops) |
60 | { | 60 | { |
61 | const char *type; | ||
62 | struct device *dev = &pdev->dev; | 61 | struct device *dev = &pdev->dev; |
63 | struct device_node *np = dev->of_node; | ||
64 | struct pci_host_bridge *bridge; | 62 | struct pci_host_bridge *bridge; |
65 | struct pci_config_window *cfg; | 63 | struct pci_config_window *cfg; |
66 | struct list_head resources; | 64 | struct list_head resources; |
@@ -70,12 +68,6 @@ int pci_host_common_probe(struct platform_device *pdev, | |||
70 | if (!bridge) | 68 | if (!bridge) |
71 | return -ENOMEM; | 69 | return -ENOMEM; |
72 | 70 | ||
73 | type = of_get_property(np, "device_type", NULL); | ||
74 | if (!type || strcmp(type, "pci")) { | ||
75 | dev_err(dev, "invalid \"device_type\" %s\n", type); | ||
76 | return -EINVAL; | ||
77 | } | ||
78 | |||
79 | of_pci_check_probe_only(); | 71 | of_pci_check_probe_only(); |
80 | 72 | ||
81 | /* Parse and map our Configuration Space windows */ | 73 | /* Parse and map our Configuration Space windows */ |