From 1846b45a3cd34fccebdc5a128e1899cc89db585f Mon Sep 17 00:00:00 2001 From: YAMANE Toshiaki Date: Thu, 20 Sep 2012 20:58:20 +0900 Subject: [PATCH] --- yaml --- r: 325441 b: refs/heads/master c: 814394100d5bfd5b33cddede907a4e0a216b93b6 h: refs/heads/master i: 325439: 60d2a53dec5ba93886dcc63e93b2ecc5ba2edba7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts_pstor/rtsx.c | 18 +++--------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 92e0e1e610ff..4ff4c381a241 100644 --- 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 index 213829ec7df9..afe9c2e763d7 100644 --- 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;