diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2018-10-21 15:59:58 -0400 |
---|---|---|
committer | Florian Fainelli <f.fainelli@gmail.com> | 2018-11-05 15:37:22 -0500 |
commit | 0810d5cc29a1e4bb9e738a478b746aebf8dc1931 (patch) | |
tree | 4c324cb81d327be377c918071dd36fb337ac3abe /drivers | |
parent | fb14ada11d62fb849fc357a25ef8016ba438ba10 (diff) |
bus: brcmstb_gisb: simplify getting .driver_data
We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bus/brcmstb_gisb.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c index 68ac3e93b600..f58ff67e97ac 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c | |||
@@ -150,8 +150,7 @@ static ssize_t gisb_arb_get_timeout(struct device *dev, | |||
150 | struct device_attribute *attr, | 150 | struct device_attribute *attr, |
151 | char *buf) | 151 | char *buf) |
152 | { | 152 | { |
153 | struct platform_device *pdev = to_platform_device(dev); | 153 | struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev); |
154 | struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev); | ||
155 | u32 timeout; | 154 | u32 timeout; |
156 | 155 | ||
157 | mutex_lock(&gdev->lock); | 156 | mutex_lock(&gdev->lock); |
@@ -165,8 +164,7 @@ static ssize_t gisb_arb_set_timeout(struct device *dev, | |||
165 | struct device_attribute *attr, | 164 | struct device_attribute *attr, |
166 | const char *buf, size_t count) | 165 | const char *buf, size_t count) |
167 | { | 166 | { |
168 | struct platform_device *pdev = to_platform_device(dev); | 167 | struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev); |
169 | struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev); | ||
170 | int val, ret; | 168 | int val, ret; |
171 | 169 | ||
172 | ret = kstrtoint(buf, 10, &val); | 170 | ret = kstrtoint(buf, 10, &val); |
@@ -418,8 +416,7 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev) | |||
418 | #ifdef CONFIG_PM_SLEEP | 416 | #ifdef CONFIG_PM_SLEEP |
419 | static int brcmstb_gisb_arb_suspend(struct device *dev) | 417 | static int brcmstb_gisb_arb_suspend(struct device *dev) |
420 | { | 418 | { |
421 | struct platform_device *pdev = to_platform_device(dev); | 419 | struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev); |
422 | struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev); | ||
423 | 420 | ||
424 | gdev->saved_timeout = gisb_read(gdev, ARB_TIMER); | 421 | gdev->saved_timeout = gisb_read(gdev, ARB_TIMER); |
425 | 422 | ||
@@ -431,8 +428,7 @@ static int brcmstb_gisb_arb_suspend(struct device *dev) | |||
431 | */ | 428 | */ |
432 | static int brcmstb_gisb_arb_resume_noirq(struct device *dev) | 429 | static int brcmstb_gisb_arb_resume_noirq(struct device *dev) |
433 | { | 430 | { |
434 | struct platform_device *pdev = to_platform_device(dev); | 431 | struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev); |
435 | struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev); | ||
436 | 432 | ||
437 | gisb_write(gdev, gdev->saved_timeout, ARB_TIMER); | 433 | gisb_write(gdev, gdev->saved_timeout, ARB_TIMER); |
438 | 434 | ||