fix-rebase-dust.patch

Last rebase to stable-2.6.26 left some trash from rebasing the patches on top of this,
clean it back out

Signed-off-by: Andy Green <andy@openmoko.com>

5 files changed, 15 insertions, 25 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 067594c0381..954d21dcfc4 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -529,14 +529,6 @@ static pm_message_t resume_event(pm_message_t sleep_state)
 	return PMSG_ON;
 }
 
-static void
-suspend_device_dbg(struct device *dev, pm_message_t state, char *info)
-{
-	dev_err(dev, "%s%s%s\n", info, suspend_verb(state.event),
-		((state.event == PM_EVENT_SUSPEND) && device_may_wakeup(dev)) ?
-		", may wakeup" : "");
-}
-
 /**
  *	suspend_device_noirq - Shut down one device (late suspend).
  *	@dev:	Device.
diff --git a/drivers/i2c/chips/pcf50633.c b/drivers/i2c/chips/pcf50633.c
index 84e3e460901..acc7011276a 100644
--- a/drivers/i2c/chips/pcf50633.c
+++ b/drivers/i2c/chips/pcf50633.c
@@ -689,7 +689,7 @@ reschedule:
 int pcf50633_notify_usb_current_limit_change(struct pcf50633_data *pcf,
 								unsigned int ma)
 {
-	/* can happen if he calls with pcf50633_global before probe
+	/* can happen if he calls before probe
 	 * have to bail with error since we can't even schedule the work
 	 */
 	if (!pcf) {
@@ -2176,8 +2176,6 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
 		goto exit_free;
 	}
 
-	pcf50633_global = pcf;
-
 	populate_sysfs_group(pcf);
 
 	err = sysfs_create_group(&new_client->dev.kobj, &pcf_attr_group);
@@ -2226,10 +2224,10 @@ static int pcf50633_detect(struct i2c_adapter *adapter, int address, int kind)
 	 * LEDOUT register can be reset by disabling and enabling the
 	 * LED converter via control bit led_on in the LEDENA register"
 	 */
-	reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
-	reg_write(pcf, PCF50633_REG_LEDDIM, 0x01);
-	reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
-	reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f);
+	pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x00);
+	pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 0x01);
+	pcf50633_reg_write(pcf, PCF50633_REG_LEDENA, 0x01);
+	pcf50633_reg_write(pcf, PCF50633_REG_LEDOUT, 0x3f);
 
 	err = request_irq(irq, pcf50633_irq, IRQF_TRIGGER_FALLING,
 			  "pcf50633", pcf);
@@ -2490,8 +2488,6 @@ static int pcf50633_suspend(struct device *dev, pm_message_t state)
 
 	mutex_unlock(&pcf->lock);
 
-	pcf->is_suspended = 1;
-	activate_all_resume_dependencies(&pcf->resume_dependency);
 	return 0;
 }
 
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 774b71ba1dd..8f0afc3e023 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -131,9 +131,11 @@ static void touch_timer_fire(unsigned long data)
 	// if we need to send an untouch event, but we haven't yet sent the
 	// touch event (this happens if the touchscreen was tapped lightly),
 	// send the touch event first
-	if (!updown && !ts.flag_first_touch_sent && ts.count != 0) {
-		input_report_abs(ts.dev, ABS_X, ts.xp >> ts.shift);
-		input_report_abs(ts.dev, ABS_Y, ts.yp >> ts.shift);
+	if (!updown && !ts.flag_first_touch_sent) {
+		if (ts.tsf[0])
+			(ts.tsf[0]->api->scale)(ts.tsf[0], &ts.coords[0]);
+		input_report_abs(ts.dev, ABS_X, ts.coords[0]);
+		input_report_abs(ts.dev, ABS_Y, ts.coords[1]);
 
 		input_report_key(ts.dev, BTN_TOUCH, 1);
 		input_report_abs(ts.dev, ABS_PRESSURE, 1);
diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
index 533f8f38427..d605e2d7cb8 100644
--- a/drivers/mfd/glamo/glamo-core.c
+++ b/drivers/mfd/glamo/glamo-core.c
@@ -1212,7 +1212,7 @@ static int __init glamo_probe(struct platform_device *pdev)
 	if (glamo->pdata->glamo_irq_is_wired &&
 	    !glamo->pdata->glamo_irq_is_wired()) {
 		set_irq_chained_handler(glamo->irq, glamo_irq_demux_handler);
-		set_irq_type(glamo->irq, IRQT_FALLING);
+		set_irq_type(glamo->irq, IRQ_TYPE_EDGE_FALLING);
 		dev_info(&pdev->dev, "Glamo interrupt registered\n");
 		glamo->irq_works = 1;
 	} else {
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
index b5d6ad10dd9..1a8e70251d5 100644
--- a/drivers/mfd/glamo/glamo-mci.c
+++ b/drivers/mfd/glamo/glamo-mci.c
@@ -285,11 +285,11 @@ static void __glamo_mci_fix_card_div(struct glamo_mci_host *host, int div)
 	 * register shared with SCLK divisor -- no chance of race because
 	 * we don't use sensor interface
 	 */
-	writew_dly((readw(glamo_mci_def_pdata.pglamo->base +
+	writew((readw(glamo_mci_def_pdata.pglamo->base +
 			GLAMO_REG_CLOCK_GEN8) & 0xff00) | div,
 		glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN8);
 	/* enable clock to divider input */
-	writew_dly(readw(glamo_mci_def_pdata.pglamo->base +
+	writew(readw(glamo_mci_def_pdata.pglamo->base +
 		GLAMO_REG_CLOCK_GEN5_1) | GLAMO_CLOCK_GEN51_EN_DIV_TCLK,
 		glamo_mci_def_pdata.pglamo->base + GLAMO_REG_CLOCK_GEN5_1);
 
@@ -628,12 +628,12 @@ static void glamo_mci_send_request(struct mmc_host *mmc)
 	 */
 	do
 		status = readw(host->base + GLAMO_REG_MMC_RB_STAT1);
-	while ((((status >> 15) & 1) != (host->ccnt & 1)) ||
+	while (((((status >> 15) & 1) != (host->ccnt & 1)) ||
 		(!(status & (GLAMO_STAT1_MMC_RB_RRDY |
 			     GLAMO_STAT1_MMC_RTOUT |
 			     GLAMO_STAT1_MMC_DTOUT |
 			     GLAMO_STAT1_MMC_BWERR |
-			     GLAMO_STAT1_MMC_BRERR))) && (insanity_timeout--));
+			     GLAMO_STAT1_MMC_BRERR)))) && (insanity_timeout--));
 
 	if (insanity_timeout < 0) {
 		cmd->error = -ETIMEDOUT;