| Message ID | 1498699369-65515-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jun 29, 2017 at 09:22:49AM +0800, Shawn Lin wrote: > We have "struct device *dev" in rockchip_pcie_probe but > still fetch it from pdev and rockchip->dev somewhere. > This patch tries to improve and no functional change intended. > > Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Applied to pci/host-rockchip for v4.13, thanks! I don't object to patches 1 & 2, but haven't applied them yet in case Rob has any comments. > --- > > drivers/pci/host/pcie-rockchip.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c > index c545213..eb0a170 100644 > --- a/drivers/pci/host/pcie-rockchip.c > +++ b/drivers/pci/host/pcie-rockchip.c > @@ -1482,15 +1482,14 @@ static int rockchip_pcie_probe(struct platform_device *pdev) > if (err) > goto err_free_res; > > - rockchip->msg_region = devm_ioremap(rockchip->dev, > - rockchip->msg_bus_addr, SZ_1M); > + rockchip->msg_region = devm_ioremap(dev, rockchip->msg_bus_addr, SZ_1M); > if (!rockchip->msg_region) { > err = -ENOMEM; > goto err_free_res; > } > > list_splice_init(&res, &bridge->windows); > - bridge->dev.parent = &pdev->dev; > + bridge->dev.parent = dev; > bridge->sysdata = rockchip; > bridge->busnr = 0; > bridge->ops = &rockchip_pcie_ops; > -- > 1.9.1 > >
Hi Bjorn, On 2017/7/3 5:30, Bjorn Helgaas wrote: > On Thu, Jun 29, 2017 at 09:22:49AM +0800, Shawn Lin wrote: >> We have "struct device *dev" in rockchip_pcie_probe but >> still fetch it from pdev and rockchip->dev somewhere. >> This patch tries to improve and no functional change intended. >> >> Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> > > Applied to pci/host-rockchip for v4.13, thanks! > > I don't object to patches 1 & 2, but haven't applied them yet in case Rob > has any comments. It's possible for patches 1 & 2 to be the candidate of v4.13 at the last minute? :) > >> --- >> >> drivers/pci/host/pcie-rockchip.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c >> index c545213..eb0a170 100644 >> --- a/drivers/pci/host/pcie-rockchip.c >> +++ b/drivers/pci/host/pcie-rockchip.c >> @@ -1482,15 +1482,14 @@ static int rockchip_pcie_probe(struct platform_device *pdev) >> if (err) >> goto err_free_res; >> >> - rockchip->msg_region = devm_ioremap(rockchip->dev, >> - rockchip->msg_bus_addr, SZ_1M); >> + rockchip->msg_region = devm_ioremap(dev, rockchip->msg_bus_addr, SZ_1M); >> if (!rockchip->msg_region) { >> err = -ENOMEM; >> goto err_free_res; >> } >> >> list_splice_init(&res, &bridge->windows); >> - bridge->dev.parent = &pdev->dev; >> + bridge->dev.parent = dev; >> bridge->sysdata = rockchip; >> bridge->busnr = 0; >> bridge->ops = &rockchip_pcie_ops; >> -- >> 1.9.1 >> >> > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip > > >
diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c index c545213..eb0a170 100644 --- a/drivers/pci/host/pcie-rockchip.c +++ b/drivers/pci/host/pcie-rockchip.c @@ -1482,15 +1482,14 @@ static int rockchip_pcie_probe(struct platform_device *pdev) if (err) goto err_free_res; - rockchip->msg_region = devm_ioremap(rockchip->dev, - rockchip->msg_bus_addr, SZ_1M); + rockchip->msg_region = devm_ioremap(dev, rockchip->msg_bus_addr, SZ_1M); if (!rockchip->msg_region) { err = -ENOMEM; goto err_free_res; } list_splice_init(&res, &bridge->windows); - bridge->dev.parent = &pdev->dev; + bridge->dev.parent = dev; bridge->sysdata = rockchip; bridge->busnr = 0; bridge->ops = &rockchip_pcie_ops;
We have "struct device *dev" in rockchip_pcie_probe but still fetch it from pdev and rockchip->dev somewhere. This patch tries to improve and no functional change intended. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> --- drivers/pci/host/pcie-rockchip.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)