Merge branch 'pci/host-hisi' into next
* pci/host-hisi: PCI: hisi: Constify dw_pcie_host_ops structure PCI: hisi: Remove unused variable driver
This commit is contained in:
commit
6238e057d4
@ -223,7 +223,7 @@ static int hisi_pcie_link_up(struct dw_pcie *pci)
|
||||
return hisi_pcie->soc_ops->hisi_pcie_link_up(hisi_pcie);
|
||||
}
|
||||
|
||||
static struct dw_pcie_host_ops hisi_pcie_host_ops = {
|
||||
static const struct dw_pcie_host_ops hisi_pcie_host_ops = {
|
||||
.rd_own_conf = hisi_pcie_cfg_read,
|
||||
.wr_own_conf = hisi_pcie_cfg_write,
|
||||
};
|
||||
@ -268,7 +268,6 @@ static int hisi_pcie_probe(struct platform_device *pdev)
|
||||
struct dw_pcie *pci;
|
||||
struct hisi_pcie *hisi_pcie;
|
||||
struct resource *reg;
|
||||
struct device_driver *driver;
|
||||
int ret;
|
||||
|
||||
hisi_pcie = devm_kzalloc(dev, sizeof(*hisi_pcie), GFP_KERNEL);
|
||||
@ -282,8 +281,6 @@ static int hisi_pcie_probe(struct platform_device *pdev)
|
||||
pci->dev = dev;
|
||||
pci->ops = &dw_pcie_ops;
|
||||
|
||||
driver = dev->driver;
|
||||
|
||||
hisi_pcie->pci = pci;
|
||||
|
||||
hisi_pcie->soc_ops = of_device_get_match_data(dev);
|
||||
|
Loading…
Reference in New Issue
Block a user