tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Greg Kroah-Hartman 5e9a8bd6 864e1e8d

+7 -7
unified split
+7 -7
drivers/video/omap/omapfb_main.c
··· 1254 1254 static ssize_t omapfb_show_caps_num(struct device *dev, 1255 1255 struct device_attribute *attr, char *buf) 1256 1256 { 1257 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1257 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1258 1258 int plane; 1259 1259 size_t size; 1260 1260 struct omapfb_caps caps; ··· 1274 1274 static ssize_t omapfb_show_caps_text(struct device *dev, 1275 1275 struct device_attribute *attr, char *buf) 1276 1276 { 1277 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1277 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1278 1278 int i; 1279 1279 struct omapfb_caps caps; 1280 1280 int plane; ··· 1321 1321 static ssize_t omapfb_show_panel_name(struct device *dev, 1322 1322 struct device_attribute *attr, char *buf) 1323 1323 { 1324 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1324 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1325 1325 1326 1326 return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->panel->name); 1327 1327 } ··· 1330 1330 struct device_attribute *attr, 1331 1331 char *buf) 1332 1332 { 1333 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1333 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1334 1334 int r; 1335 1335 1336 1336 if (fbdev->panel->get_bklight_level) { ··· 1345 1345 struct device_attribute *attr, 1346 1346 const char *buf, size_t size) 1347 1347 { 1348 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1348 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1349 1349 int r; 1350 1350 1351 1351 if (fbdev->panel->set_bklight_level) { ··· 1364 1364 static ssize_t omapfb_show_bklight_max(struct device *dev, 1365 1365 struct device_attribute *attr, char *buf) 1366 1366 { 1367 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1367 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1368 1368 int r; 1369 1369 1370 1370 if (fbdev->panel->get_bklight_level) { ··· 1397 1397 static ssize_t omapfb_show_ctrl_name(struct device *dev, 1398 1398 struct device_attribute *attr, char *buf) 1399 1399 { 1400 - struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data; 1400 + struct omapfb_device *fbdev = dev_get_drvdata(dev); 1401 1401 1402 1402 return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->ctrl->name); 1403 1403 }