Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (29 commits) [ARM] 4062/1: S3C24XX: Anubis and Osiris shuld have CONFIG_PM_SIMTEC [ARM] 4060/1: update several ARM defconfigs [ARM] 4061/1: xsc3: change of maintainer [ARM] 4059/1: VR1000: fix LED3's platform device number [ARM] 4022/1: iop13xx: generic irq fixups [ARM] 4015/1: s3c2410 cpu ifdefs [ARM] 4057/1: ixp23xx: unconditionally enable hardware coherency [ARM] 4056/1: iop13xx: fix resource.end off-by-one in flash setup [ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc [ARM] 4054/1: ep93xx: add HWCAP_CRUNCH [ARM] 4052/1: S3C24XX: Fix PM in arch/arm/mach-s3c2410/Kconfig [ARM] Fix warnings from asm/system.h [ARM] 4051/1: S3C24XX: clean includes in S3C2440 and S3C2442 support [ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410 [ARM] 4049/1: S3C24XX: fix sparse warning due to upf_t in regs-serial.h [ARM] 4048/1: S3C24XX: make s3c2410_pm_resume() static [ARM] 4046/1: S3C24XX: fix sparse errors arch/arm/mach-s3c2410 [ARM] 4045/1: S3C24XX: remove old VA for non-shared areas [ARM] 4044/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2442-clock.c [ARM] 4043/1: S3C24XX: fix sparse warnings in arch/arm/mach-s3c2410/s3c2440-clock.c ...
author: Linus Torvalds <torvalds@woody.osdl.org> 2006-12-21 02:54:23 -0500
committer: Linus Torvalds <torvalds@woody.osdl.org> 2006-12-21 02:54:23 -0500
commit: eb2112fbcf2d97eda221790bd53cb3a2cdf58c95 (patch)
tree: 1343d534a374653d26fecfb9657c9e3d3d05dbc6 /drivers
parent: f238085415c56618e042252894f2fcc971add645 (diff)
parent: 618b20a13e9ef4ed1d16f1ab94ccce8e4f55f9d9 (diff)
2 files changed, 23 insertions, 23 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 38eb0b69c2d7..b4947c810706 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1216,7 +1216,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                done:
                        if (res_specified) {
                                dev_info(dev, "overriding resolution: %dx%d\n", xres, yres);
-                                inf->xres = xres; inf->yres = yres;
+                                inf->modes[0].xres = xres; inf->modes[0].yres = yres;
                        }
                        if (bpp_specified)
                                switch (bpp) {
@@ -1225,48 +1225,48 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                                case 4:
                                case 8:
                                case 16:
-                                        inf->bpp = bpp;
+                                        inf->modes[0].bpp = bpp;
                                        dev_info(dev, "overriding bit depth: %d\n", bpp);
                                        break;
                                default:
                                        dev_err(dev, "Depth %d is not valid\n", bpp);
                                }
                } else if (!strncmp(this_opt, "pixclock:", 9)) {
-                        inf->pixclock = simple_strtoul(this_opt+9, NULL, 0);
+                        inf->modes[0].pixclock = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override pixclock: %ld\n", inf->pixclock);
+                        dev_info(dev, "override pixclock: %ld\n", inf->modes[0].pixclock);
                } else if (!strncmp(this_opt, "left:", 5)) {
-                        inf->left_margin = simple_strtoul(this_opt+5, NULL, 0);
+                        inf->modes[0].left_margin = simple_strtoul(this_opt+5, NULL, 0);
-                        dev_info(dev, "override left: %u\n", inf->left_margin);
+                        dev_info(dev, "override left: %u\n", inf->modes[0].left_margin);
                } else if (!strncmp(this_opt, "right:", 6)) {
-                        inf->right_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        inf->modes[0].right_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override right: %u\n", inf->right_margin);
+                        dev_info(dev, "override right: %u\n", inf->modes[0].right_margin);
                } else if (!strncmp(this_opt, "upper:", 6)) {
-                        inf->upper_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        inf->modes[0].upper_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override upper: %u\n", inf->upper_margin);
+                        dev_info(dev, "override upper: %u\n", inf->modes[0].upper_margin);
                } else if (!strncmp(this_opt, "lower:", 6)) {
-                        inf->lower_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        inf->modes[0].lower_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override lower: %u\n", inf->lower_margin);
+                        dev_info(dev, "override lower: %u\n", inf->modes[0].lower_margin);
                } else if (!strncmp(this_opt, "hsynclen:", 9)) {
-                        inf->hsync_len = simple_strtoul(this_opt+9, NULL, 0);
+                        inf->modes[0].hsync_len = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override hsynclen: %u\n", inf->hsync_len);
+                        dev_info(dev, "override hsynclen: %u\n", inf->modes[0].hsync_len);
                } else if (!strncmp(this_opt, "vsynclen:", 9)) {
-                        inf->vsync_len = simple_strtoul(this_opt+9, NULL, 0);
+                        inf->modes[0].vsync_len = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override vsynclen: %u\n", inf->vsync_len);
+                        dev_info(dev, "override vsynclen: %u\n", inf->modes[0].vsync_len);
                } else if (!strncmp(this_opt, "hsync:", 6)) {
                        if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
                                dev_info(dev, "override hsync: Active Low\n");
-                                inf->sync &= ~FB_SYNC_HOR_HIGH_ACT;
+                                inf->modes[0].sync &= ~FB_SYNC_HOR_HIGH_ACT;
                        } else {
                                dev_info(dev, "override hsync: Active High\n");
-                                inf->sync |= FB_SYNC_HOR_HIGH_ACT;
+                                inf->modes[0].sync |= FB_SYNC_HOR_HIGH_ACT;
                        }
                } else if (!strncmp(this_opt, "vsync:", 6)) {
                        if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
                                dev_info(dev, "override vsync: Active Low\n");
-                                inf->sync &= ~FB_SYNC_VERT_HIGH_ACT;
+                                inf->modes[0].sync &= ~FB_SYNC_VERT_HIGH_ACT;
                        } else {
                                dev_info(dev, "override vsync: Active High\n");
-                                inf->sync |= FB_SYNC_VERT_HIGH_ACT;
+                                inf->modes[0].sync |= FB_SYNC_VERT_HIGH_ACT;
                        }
                } else if (!strncmp(this_opt, "dpc:", 4)) {
                        if (simple_strtoul(this_opt+4, NULL, 0) == 0) {
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index cd10b18150b8..5d2a4a4b731c 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
 * Our LCD controller task (which is called when we blank or unblank)
 * via keventd.
 */
-static void sa1100fb_task(void *dummy)
+static void sa1100fb_task(struct work_struct *w)
 {
-        struct sa1100fb_info *fbi = dummy;
+        struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task);
        u_int state = xchg(&fbi->task_state, -1);
        set_ctrlr_state(fbi, state);
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
                                          fbi->max_bpp / 8;
        init_waitqueue_head(&fbi->ctrlr_wait);
-        INIT_WORK(&fbi->task, sa1100fb_task, fbi);
+        INIT_WORK(&fbi->task, sa1100fb_task);
        init_MUTEX(&fbi->ctrlr_sem);
        return fbi;
author	Linus Torvalds <torvalds@woody.osdl.org>	2006-12-21 02:54:23 -0500
committer	Linus Torvalds <torvalds@woody.osdl.org>	2006-12-21 02:54:23 -0500
commit	eb2112fbcf2d97eda221790bd53cb3a2cdf58c95 (patch)
tree	1343d534a374653d26fecfb9657c9e3d3d05dbc6 /drivers
parent	f238085415c56618e042252894f2fcc971add645 (diff)
parent	618b20a13e9ef4ed1d16f1ab94ccce8e4f55f9d9 (diff)

diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 38eb0b69c2d7..b4947c810706 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c
@@ -1216,7 +1216,7 @@ static int __init pxafb_parse_options(struct device dev, char options)
1216	done:	1216	done:
1217	if (res_specified) {	1217	if (res_specified) {
1218	dev_info(dev, "overriding resolution: %dx%d\n", xres, yres);	1218	dev_info(dev, "overriding resolution: %dx%d\n", xres, yres);
1219	inf->xres = xres; inf->yres = yres;	1219	inf->modes[0].xres = xres; inf->modes[0].yres = yres;
1220	}	1220	}
1221	if (bpp_specified)	1221	if (bpp_specified)
1222	switch (bpp) {	1222	switch (bpp) {
@@ -1225,48 +1225,48 @@ static int __init pxafb_parse_options(struct device dev, char options)
1225	case 4:	1225	case 4:
1226	case 8:	1226	case 8:
1227	case 16:	1227	case 16:
1228	inf->bpp = bpp;	1228	inf->modes[0].bpp = bpp;
1229	dev_info(dev, "overriding bit depth: %d\n", bpp);	1229	dev_info(dev, "overriding bit depth: %d\n", bpp);
1230	break;	1230	break;
1231	default:	1231	default:
1232	dev_err(dev, "Depth %d is not valid\n", bpp);	1232	dev_err(dev, "Depth %d is not valid\n", bpp);
1233	}	1233	}
1234	} else if (!strncmp(this_opt, "pixclock:", 9)) {	1234	} else if (!strncmp(this_opt, "pixclock:", 9)) {
1235	inf->pixclock = simple_strtoul(this_opt+9, NULL, 0);	1235	inf->modes[0].pixclock = simple_strtoul(this_opt+9, NULL, 0);
1236	dev_info(dev, "override pixclock: %ld\n", inf->pixclock);	1236	dev_info(dev, "override pixclock: %ld\n", inf->modes[0].pixclock);
1237	} else if (!strncmp(this_opt, "left:", 5)) {	1237	} else if (!strncmp(this_opt, "left:", 5)) {
1238	inf->left_margin = simple_strtoul(this_opt+5, NULL, 0);	1238	inf->modes[0].left_margin = simple_strtoul(this_opt+5, NULL, 0);
1239	dev_info(dev, "override left: %u\n", inf->left_margin);	1239	dev_info(dev, "override left: %u\n", inf->modes[0].left_margin);
1240	} else if (!strncmp(this_opt, "right:", 6)) {	1240	} else if (!strncmp(this_opt, "right:", 6)) {
1241	inf->right_margin = simple_strtoul(this_opt+6, NULL, 0);	1241	inf->modes[0].right_margin = simple_strtoul(this_opt+6, NULL, 0);
1242	dev_info(dev, "override right: %u\n", inf->right_margin);	1242	dev_info(dev, "override right: %u\n", inf->modes[0].right_margin);
1243	} else if (!strncmp(this_opt, "upper:", 6)) {	1243	} else if (!strncmp(this_opt, "upper:", 6)) {
1244	inf->upper_margin = simple_strtoul(this_opt+6, NULL, 0);	1244	inf->modes[0].upper_margin = simple_strtoul(this_opt+6, NULL, 0);
1245	dev_info(dev, "override upper: %u\n", inf->upper_margin);	1245	dev_info(dev, "override upper: %u\n", inf->modes[0].upper_margin);
1246	} else if (!strncmp(this_opt, "lower:", 6)) {	1246	} else if (!strncmp(this_opt, "lower:", 6)) {
1247	inf->lower_margin = simple_strtoul(this_opt+6, NULL, 0);	1247	inf->modes[0].lower_margin = simple_strtoul(this_opt+6, NULL, 0);
1248	dev_info(dev, "override lower: %u\n", inf->lower_margin);	1248	dev_info(dev, "override lower: %u\n", inf->modes[0].lower_margin);
1249	} else if (!strncmp(this_opt, "hsynclen:", 9)) {	1249	} else if (!strncmp(this_opt, "hsynclen:", 9)) {
1250	inf->hsync_len = simple_strtoul(this_opt+9, NULL, 0);	1250	inf->modes[0].hsync_len = simple_strtoul(this_opt+9, NULL, 0);
1251	dev_info(dev, "override hsynclen: %u\n", inf->hsync_len);	1251	dev_info(dev, "override hsynclen: %u\n", inf->modes[0].hsync_len);
1252	} else if (!strncmp(this_opt, "vsynclen:", 9)) {	1252	} else if (!strncmp(this_opt, "vsynclen:", 9)) {
1253	inf->vsync_len = simple_strtoul(this_opt+9, NULL, 0);	1253	inf->modes[0].vsync_len = simple_strtoul(this_opt+9, NULL, 0);
1254	dev_info(dev, "override vsynclen: %u\n", inf->vsync_len);	1254	dev_info(dev, "override vsynclen: %u\n", inf->modes[0].vsync_len);
1255	} else if (!strncmp(this_opt, "hsync:", 6)) {	1255	} else if (!strncmp(this_opt, "hsync:", 6)) {
1256	if (simple_strtoul(this_opt+6, NULL, 0) == 0) {	1256	if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
1257	dev_info(dev, "override hsync: Active Low\n");	1257	dev_info(dev, "override hsync: Active Low\n");
1258	inf->sync &= ~FB_SYNC_HOR_HIGH_ACT;	1258	inf->modes[0].sync &= ~FB_SYNC_HOR_HIGH_ACT;
1259	} else {	1259	} else {
1260	dev_info(dev, "override hsync: Active High\n");	1260	dev_info(dev, "override hsync: Active High\n");
1261	inf->sync \|= FB_SYNC_HOR_HIGH_ACT;	1261	inf->modes[0].sync \|= FB_SYNC_HOR_HIGH_ACT;
1262	}	1262	}
1263	} else if (!strncmp(this_opt, "vsync:", 6)) {	1263	} else if (!strncmp(this_opt, "vsync:", 6)) {
1264	if (simple_strtoul(this_opt+6, NULL, 0) == 0) {	1264	if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
1265	dev_info(dev, "override vsync: Active Low\n");	1265	dev_info(dev, "override vsync: Active Low\n");
1266	inf->sync &= ~FB_SYNC_VERT_HIGH_ACT;	1266	inf->modes[0].sync &= ~FB_SYNC_VERT_HIGH_ACT;
1267	} else {	1267	} else {
1268	dev_info(dev, "override vsync: Active High\n");	1268	dev_info(dev, "override vsync: Active High\n");
1269	inf->sync \|= FB_SYNC_VERT_HIGH_ACT;	1269	inf->modes[0].sync \|= FB_SYNC_VERT_HIGH_ACT;
1270	}	1270	}
1271	} else if (!strncmp(this_opt, "dpc:", 4)) {	1271	} else if (!strncmp(this_opt, "dpc:", 4)) {
1272	if (simple_strtoul(this_opt+4, NULL, 0) == 0) {	1272	if (simple_strtoul(this_opt+4, NULL, 0) == 0) {


diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index cd10b18150b8..5d2a4a4b731c 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
1200	* Our LCD controller task (which is called when we blank or unblank)	1200	* Our LCD controller task (which is called when we blank or unblank)
1201	* via keventd.	1201	* via keventd.
1202	*/	1202	*/
1203	static void sa1100fb_task(void *dummy)	1203	static void sa1100fb_task(struct work_struct *w)
1204	{	1204	{
1205	struct sa1100fb_info *fbi = dummy;	1205	struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task);
1206	u_int state = xchg(&fbi->task_state, -1);	1206	u_int state = xchg(&fbi->task_state, -1);
1207		1207
1208	set_ctrlr_state(fbi, state);	1208	set_ctrlr_state(fbi, state);
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
1444	fbi->max_bpp / 8;	1444	fbi->max_bpp / 8;
1445		1445
1446	init_waitqueue_head(&fbi->ctrlr_wait);	1446	init_waitqueue_head(&fbi->ctrlr_wait);
1447	INIT_WORK(&fbi->task, sa1100fb_task, fbi);	1447	INIT_WORK(&fbi->task, sa1100fb_task);
1448	init_MUTEX(&fbi->ctrlr_sem);	1448	init_MUTEX(&fbi->ctrlr_sem);
1449		1449
1450	return fbi;	1450	return fbi;