---

yaml
---
r: 9789
b: refs/heads/master
c: 585f545
h: refs/heads/master
i:
  9787: 0d70a91
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec384d297c2c47611cae835284fe970073d41783
+refs/heads/master: 585f54575d832506bbe9b5a2f435f37b81efc849

trunk/arch/arm/common/scoop.c

@@ -26,8 +26,6 @@ struct scoop_pcmcia_dev *scoop_devs;
 struct  scoop_dev {
 	void  *base;
 	spinlock_t scoop_lock;
-	unsigned short suspend_clr;
-	unsigned short suspend_set;
 	u32 scoop_gpwr;
 };
 
@@ -92,24 +90,14 @@ EXPORT_SYMBOL(reset_scoop);
 EXPORT_SYMBOL(read_scoop_reg);
 EXPORT_SYMBOL(write_scoop_reg);
 
-static void check_scoop_reg(struct scoop_dev *sdev)
-{
-	unsigned short mcr;
-
-	mcr = SCOOP_REG(sdev->base, SCOOP_MCR);
-	if ((mcr & 0x100) == 0)
-		SCOOP_REG(sdev->base, SCOOP_MCR) = 0x0101;
-}
-
 #ifdef CONFIG_PM
 static int scoop_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
 	if (level == SUSPEND_POWER_DOWN) {
 		struct scoop_dev *sdev = dev_get_drvdata(dev);
 
-		check_scoop_reg(sdev);
-  		sdev->scoop_gpwr = SCOOP_REG(sdev->base, SCOOP_GPWR);
-		SCOOP_REG(sdev->base, SCOOP_GPWR) = (sdev->scoop_gpwr & ~sdev->suspend_clr) | sdev->suspend_set;
+		sdev->scoop_gpwr = SCOOP_REG(sdev->base,SCOOP_GPWR);
+		SCOOP_REG(sdev->base,SCOOP_GPWR) = 0;
 	}
 	return 0;
 }
@@ -119,7 +107,6 @@ static int scoop_resume(struct device *dev, uint32_t level)
 	if (level == RESUME_POWER_ON) {
 		struct scoop_dev *sdev = dev_get_drvdata(dev);
 
-		check_scoop_reg(sdev);
 		SCOOP_REG(sdev->base,SCOOP_GPWR) = sdev->scoop_gpwr;
 	}
 	return 0;
@@ -164,9 +151,6 @@ int __init scoop_probe(struct device *dev)
 	SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff;
 	SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
 
-	devptr->suspend_clr = inf->suspend_clr;
-	devptr->suspend_set = inf->suspend_set;
-
 	return 0;
 }