|
@@ -47,7 +47,6 @@ MODULE_DEVICE_TABLE(of, iproc_pcie_of_match_table);
|
|
static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
|
|
static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
|
|
{
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct device *dev = &pdev->dev;
|
|
- const struct of_device_id *of_id;
|
|
|
|
struct iproc_pcie *pcie;
|
|
struct iproc_pcie *pcie;
|
|
struct device_node *np = dev->of_node;
|
|
struct device_node *np = dev->of_node;
|
|
struct resource reg;
|
|
struct resource reg;
|
|
@@ -55,16 +54,12 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
|
|
LIST_HEAD(res);
|
|
LIST_HEAD(res);
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- of_id = of_match_device(iproc_pcie_of_match_table, dev);
|
|
|
|
- if (!of_id)
|
|
|
|
- return -EINVAL;
|
|
|
|
-
|
|
|
|
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
|
|
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
|
|
if (!pcie)
|
|
if (!pcie)
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
|
|
|
|
pcie->dev = dev;
|
|
pcie->dev = dev;
|
|
- pcie->type = (enum iproc_pcie_type)of_id->data;
|
|
|
|
|
|
+ pcie->type = (enum iproc_pcie_type) of_device_get_match_data(dev);
|
|
|
|
|
|
ret = of_address_to_resource(np, 0, ®);
|
|
ret = of_address_to_resource(np, 0, ®);
|
|
if (ret < 0) {
|
|
if (ret < 0) {
|