| Message ID | 1378801844.4539.1.camel@chaos.site (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 10, 2013 at 4:30 AM, Jean Delvare <jdelvare@suse.de> wrote: > You can get the driver data from struct device directly, there's no > need to get the PCI device first. > > Signed-off-by: Jean Delvare <jdelvare@suse.de> > Cc: David Airlie <airlied@linux.ie> > Cc: Alex Deucher <alexander.deucher@amd.com> Applied. thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_pm.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > --- linux-3.11-rc7.orig/drivers/gpu/drm/radeon/radeon_pm.c 2013-09-02 22:06:28.569606289 +0200 > +++ linux-3.11-rc7/drivers/gpu/drm/radeon/radeon_pm.c 2013-09-03 09:20:41.850518596 +0200 > @@ -333,7 +333,7 @@ static ssize_t radeon_get_pm_profile(str > struct device_attribute *attr, > char *buf) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > int cp = rdev->pm.profile; > > @@ -349,7 +349,7 @@ static ssize_t radeon_set_pm_profile(str > const char *buf, > size_t count) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > > mutex_lock(&rdev->pm.mutex); > @@ -383,7 +383,7 @@ static ssize_t radeon_get_pm_method(stru > struct device_attribute *attr, > char *buf) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > int pm = rdev->pm.pm_method; > > @@ -397,7 +397,7 @@ static ssize_t radeon_set_pm_method(stru > const char *buf, > size_t count) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > > /* we don't support the legacy modes with dpm */ > @@ -433,7 +433,7 @@ static ssize_t radeon_get_dpm_state(stru > struct device_attribute *attr, > char *buf) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > enum radeon_pm_state_type pm = rdev->pm.dpm.user_state; > > @@ -447,7 +447,7 @@ static ssize_t radeon_set_dpm_state(stru > const char *buf, > size_t count) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > > mutex_lock(&rdev->pm.mutex); > @@ -472,7 +472,7 @@ static ssize_t radeon_get_dpm_forced_per > struct device_attribute *attr, > char *buf) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level; > > @@ -486,7 +486,7 @@ static ssize_t radeon_set_dpm_forced_per > const char *buf, > size_t count) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > enum radeon_dpm_forced_level level; > int ret = 0; > @@ -524,7 +524,7 @@ static ssize_t radeon_hwmon_show_temp(st > struct device_attribute *attr, > char *buf) > { > - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); > + struct drm_device *ddev = dev_get_drvdata(dev); > struct radeon_device *rdev = ddev->dev_private; > int temp; > > > -- > Jean Delvare > Suse L3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
--- linux-3.11-rc7.orig/drivers/gpu/drm/radeon/radeon_pm.c 2013-09-02 22:06:28.569606289 +0200 +++ linux-3.11-rc7/drivers/gpu/drm/radeon/radeon_pm.c 2013-09-03 09:20:41.850518596 +0200 @@ -333,7 +333,7 @@ static ssize_t radeon_get_pm_profile(str struct device_attribute *attr, char *buf) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; int cp = rdev->pm.profile; @@ -349,7 +349,7 @@ static ssize_t radeon_set_pm_profile(str const char *buf, size_t count) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; mutex_lock(&rdev->pm.mutex); @@ -383,7 +383,7 @@ static ssize_t radeon_get_pm_method(stru struct device_attribute *attr, char *buf) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; int pm = rdev->pm.pm_method; @@ -397,7 +397,7 @@ static ssize_t radeon_set_pm_method(stru const char *buf, size_t count) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; /* we don't support the legacy modes with dpm */ @@ -433,7 +433,7 @@ static ssize_t radeon_get_dpm_state(stru struct device_attribute *attr, char *buf) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; enum radeon_pm_state_type pm = rdev->pm.dpm.user_state; @@ -447,7 +447,7 @@ static ssize_t radeon_set_dpm_state(stru const char *buf, size_t count) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; mutex_lock(&rdev->pm.mutex); @@ -472,7 +472,7 @@ static ssize_t radeon_get_dpm_forced_per struct device_attribute *attr, char *buf) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level; @@ -486,7 +486,7 @@ static ssize_t radeon_set_dpm_forced_per const char *buf, size_t count) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; enum radeon_dpm_forced_level level; int ret = 0; @@ -524,7 +524,7 @@ static ssize_t radeon_hwmon_show_temp(st struct device_attribute *attr, char *buf) { - struct drm_device *ddev = pci_get_drvdata(to_pci_dev(dev)); + struct drm_device *ddev = dev_get_drvdata(dev); struct radeon_device *rdev = ddev->dev_private; int temp;
You can get the driver data from struct device directly, there's no need to get the PCI device first. Signed-off-by: Jean Delvare <jdelvare@suse.de> Cc: David Airlie <airlied@linux.ie> Cc: Alex Deucher <alexander.deucher@amd.com> --- drivers/gpu/drm/radeon/radeon_pm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)