mirror of
https://github.com/adulau/aha.git
synced 2024-12-30 12:46:17 +00:00
omap: video: remove direct access of driver_data
dev_set/get_drvdata() should be used instead, as driver_data is going away. Cc: Imre Deak <imre.deak@nokia.com> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Andrew Morton <akpm@linux-foundation.org> Acked-by: Trilok Soni <soni.trilok@gmail.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Felipe Contreras <felipe.contreras@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
864e1e8db4
commit
5e9a8bd657
1 changed files with 7 additions and 7 deletions
|
@ -1254,7 +1254,7 @@ static struct fb_ops omapfb_ops = {
|
||||||
static ssize_t omapfb_show_caps_num(struct device *dev,
|
static ssize_t omapfb_show_caps_num(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
int plane;
|
int plane;
|
||||||
size_t size;
|
size_t size;
|
||||||
struct omapfb_caps caps;
|
struct omapfb_caps caps;
|
||||||
|
@ -1274,7 +1274,7 @@ static ssize_t omapfb_show_caps_num(struct device *dev,
|
||||||
static ssize_t omapfb_show_caps_text(struct device *dev,
|
static ssize_t omapfb_show_caps_text(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
int i;
|
int i;
|
||||||
struct omapfb_caps caps;
|
struct omapfb_caps caps;
|
||||||
int plane;
|
int plane;
|
||||||
|
@ -1321,7 +1321,7 @@ static DEVICE_ATTR(caps_text, 0444, omapfb_show_caps_text, NULL);
|
||||||
static ssize_t omapfb_show_panel_name(struct device *dev,
|
static ssize_t omapfb_show_panel_name(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
|
|
||||||
return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->panel->name);
|
return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->panel->name);
|
||||||
}
|
}
|
||||||
|
@ -1330,7 +1330,7 @@ static ssize_t omapfb_show_bklight_level(struct device *dev,
|
||||||
struct device_attribute *attr,
|
struct device_attribute *attr,
|
||||||
char *buf)
|
char *buf)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (fbdev->panel->get_bklight_level) {
|
if (fbdev->panel->get_bklight_level) {
|
||||||
|
@ -1345,7 +1345,7 @@ static ssize_t omapfb_store_bklight_level(struct device *dev,
|
||||||
struct device_attribute *attr,
|
struct device_attribute *attr,
|
||||||
const char *buf, size_t size)
|
const char *buf, size_t size)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (fbdev->panel->set_bklight_level) {
|
if (fbdev->panel->set_bklight_level) {
|
||||||
|
@ -1364,7 +1364,7 @@ static ssize_t omapfb_store_bklight_level(struct device *dev,
|
||||||
static ssize_t omapfb_show_bklight_max(struct device *dev,
|
static ssize_t omapfb_show_bklight_max(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
if (fbdev->panel->get_bklight_level) {
|
if (fbdev->panel->get_bklight_level) {
|
||||||
|
@ -1397,7 +1397,7 @@ static struct attribute_group panel_attr_grp = {
|
||||||
static ssize_t omapfb_show_ctrl_name(struct device *dev,
|
static ssize_t omapfb_show_ctrl_name(struct device *dev,
|
||||||
struct device_attribute *attr, char *buf)
|
struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
|
struct omapfb_device *fbdev = dev_get_drvdata(dev);
|
||||||
|
|
||||||
return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->ctrl->name);
|
return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->ctrl->name);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue