| Message ID | 1343836477-7287-30-git-send-email-jiang.liu@huawei.com |
|---|---|
| State | Changes Requested |
| Headers | show |
> -----Original Message----- > From: Jiang Liu [mailto:liuj97@gmail.com] > Sent: Wednesday, August 01, 2012 11:55 AM > To: Bjorn Helgaas; Don Dutile; David Airlie; Dave Airlie; Deucher, Alexander; > Jerome Glisse > Cc: Jiang Liu; Yinghai Lu; Taku Izumi; Rafael J . Wysocki; Kenji Kaneshige; Yijing > Wang; linux-kernel@vger.kernel.org; linux-pci@vger.kernel.org; Jiang Liu > Subject: [PATCH v3 29/32] PCI/radeon: use PCIe capabilities access functions > to simplify implementation > > From: Jiang Liu <jiang.liu@huawei.com> > > Use PCIe capabilities access functions to simplify radeon driver's > implementation. > > Signed-off-by: Jiang Liu <liuj97@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/radeon/evergreen.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/evergreen.c > b/drivers/gpu/drm/radeon/evergreen.c > index 01550d0..8804c80 100644 > --- a/drivers/gpu/drm/radeon/evergreen.c > +++ b/drivers/gpu/drm/radeon/evergreen.c > @@ -77,13 +77,9 @@ void evergreen_tiling_fields(unsigned tiling_flags, > unsigned *bankw, > void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev) > { > u16 ctl, v; > - int cap, err; > + int err; > > - cap = pci_pcie_cap(rdev->pdev); > - if (!cap) > - return; > - > - err = pci_read_config_word(rdev->pdev, cap + PCI_EXP_DEVCTL, > &ctl); > + err = pci_pcie_capability_read_word(rdev->pdev, PCI_EXP_DEVCTL, > &ctl); > if (err) > return; > > @@ -95,7 +91,7 @@ void evergreen_fix_pci_max_read_req_size(struct > radeon_device *rdev) > if ((v == 0) || (v == 6) || (v == 7)) { > ctl &= ~PCI_EXP_DEVCTL_READRQ; > ctl |= (2 << 12); > - pci_write_config_word(rdev->pdev, cap + PCI_EXP_DEVCTL, > ctl); > + pci_pcie_capability_write_word(rdev->pdev, > PCI_EXP_DEVCTL, ctl); > } > } > > -- > 1.7.9.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 01550d0..8804c80 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -77,13 +77,9 @@ void evergreen_tiling_fields(unsigned tiling_flags, unsigned *bankw, void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev) { u16 ctl, v; - int cap, err; + int err; - cap = pci_pcie_cap(rdev->pdev); - if (!cap) - return; - - err = pci_read_config_word(rdev->pdev, cap + PCI_EXP_DEVCTL, &ctl); + err = pci_pcie_capability_read_word(rdev->pdev, PCI_EXP_DEVCTL, &ctl); if (err) return; @@ -95,7 +91,7 @@ void evergreen_fix_pci_max_read_req_size(struct radeon_device *rdev) if ((v == 0) || (v == 6) || (v == 7)) { ctl &= ~PCI_EXP_DEVCTL_READRQ; ctl |= (2 << 12); - pci_write_config_word(rdev->pdev, cap + PCI_EXP_DEVCTL, ctl); + pci_pcie_capability_write_word(rdev->pdev, PCI_EXP_DEVCTL, ctl); } }