---

yaml --- r: 325441 b: refs/heads/master c: 8143941 h: refs/heads/master i: 325439: 60d2a53 v: v3
git-mirror · Sep 21, 2012 · 1846b45 · 1846b45
1 parent d9338a6
commit 1846b45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 428ed14f366276550a70014ed80be941d7e721d5
+refs/heads/master: 814394100d5bfd5b33cddede907a4e0a216b93b6
diff --git a/trunk/drivers/staging/rts_pstor/rtsx.c b/trunk/drivers/staging/rts_pstor/rtsx.c
@@ -352,12 +352,8 @@ static int rtsx_suspend(struct pci_dev *pci, pm_message_t state)
 	struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
 	struct rtsx_chip *chip;
 
-	dev_info(&dev->pci->dev, "Ready to suspend\n");
-
-	if (!dev) {
-		dev_err(&dev->pci->dev, "Invalid memory\n");
+	if (!dev)
 		return 0;
-	}
 
 	/* lock the device pointers */
 	mutex_lock(&(dev->dev_mutex));
@@ -391,12 +387,8 @@ static int rtsx_resume(struct pci_dev *pci)
 	struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
 	struct rtsx_chip *chip;
 
-	dev_info(&dev->pci->dev, "Ready to resume\n");
-
-	if (!dev) {
-		dev_err(&dev->pci->dev, "Invalid memory\n");
+	if (!dev)
 		return 0;
-	}
 
 	chip = dev->chip;
 
@@ -441,12 +433,8 @@ static void rtsx_shutdown(struct pci_dev *pci)
 	struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
 	struct rtsx_chip *chip;
 
-	dev_info(&dev->pci->dev, "Ready to shutdown\n");
-
-	if (!dev) {
-		dev_err(&dev->pci->dev, "Invalid memory\n");
+	if (!dev)
 		return;
-	}
 
 	chip = dev->chip;