From: Dirk Behme <dirk.behme@de.bosch.com>
Date: Wed, 14 Sep 2005 14:14:55 +0000 (+0300)
Subject: Make omapfb_main.c compile again and remove warnings:
X-Git-Tag: v2.6.15-omap2~227
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=162a656c4a2fd6966a9874ae1874fa903b29b648;p=linux-2.6-omap-h63xx.git

Make omapfb_main.c compile again and remove warnings:
    CC      drivers/video/omap/omapfb_main.o
drivers/video/omap/omapfb_main.c: In function omapfb_suspend'
drivers/video/omap/omapfb_main.c: At top level:
drivers/video/omap/omapfb_main.c:1645: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1646: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1702: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1704: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1704: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1705: warning: initialization from
incompatible pointer type
drivers/video/omap/omapfb_main.c:1728: warning: initialization from
incompatible pointer type

Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
---

diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index aeb66c8fbb0..e22e03b18d3 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -623,7 +623,7 @@ static int omapfb_blank(int blank, struct fb_info *info)
 		omapfb_resume(fbdev->dev, 0);
 		break;
 	case VESA_POWERDOWN:
-		omapfb_suspend(fbdev->dev, 0, 0);
+	 omapfb_suspend(fbdev->dev, PMSG_SUSPEND, 0);
 		break;
 	default:
 		r = -EINVAL;
@@ -1617,7 +1617,7 @@ static struct fb_ops omapfb_ops = {
  * ---------------------------------------------------------------------------
  */
 /* omapfbX sysfs entries */
-static ssize_t omapfb_show_caps_num(struct device *dev, char *buf)
+static ssize_t omapfb_show_caps_num(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
 
@@ -1625,7 +1625,7 @@ static ssize_t omapfb_show_caps_num(struct device *dev, char *buf)
 		omapfb_get_caps(fbdev->fb_info));
 }
 
-static ssize_t omapfb_show_caps_text(struct device *dev, char *buf)
+static ssize_t omapfb_show_caps_text(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
 	int pos = 0;
@@ -1646,14 +1646,14 @@ static DEVICE_ATTR(caps_num, 0444, omapfb_show_caps_num, NULL);
 static DEVICE_ATTR(caps_text, 0444, omapfb_show_caps_text, NULL);
 
 /* panel sysfs entries */
-static ssize_t omapfb_show_panel_name(struct device *dev, char *buf)
+static ssize_t omapfb_show_panel_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
 
 	return snprintf(buf, PAGE_SIZE, "%s\n", fbdev->panel->name);
 }
 
-static ssize_t omapfb_show_bklight_level(struct device *dev, char *buf)
+static ssize_t omapfb_show_bklight_level(struct device *dev,struct device_attribute *attr, char *buf)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
 	int r;
@@ -1666,8 +1666,8 @@ static ssize_t omapfb_show_bklight_level(struct device *dev, char *buf)
 	return r;
 }
 
-static ssize_t omapfb_store_bklight_level(struct device *dev, const char *buf,
-					  size_t size)
+static ssize_t omapfb_store_bklight_level(struct device *dev, struct device_attribute *attr,
+					  const char *buf, size_t size)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
 	int r;
@@ -1685,7 +1685,7 @@ static ssize_t omapfb_store_bklight_level(struct device *dev, const char *buf,
 	return r ? r : size;
 }
 
-static ssize_t omapfb_show_bklight_max(struct device *dev, char *buf)
+static ssize_t omapfb_show_bklight_max(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;
 	int r;
@@ -1717,7 +1717,7 @@ static struct attribute_group panel_attr_grp = {
 };
 
 /* ctrl sysfs entries */
-static ssize_t omapfb_show_ctrl_name(struct device *dev, char *buf)
+static ssize_t omapfb_show_ctrl_name(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct omapfb_device *fbdev = (struct omapfb_device *)dev->driver_data;