Merge tag 'drm-intel-next-fixes-2014-12-17' of git://anongit.freedesktop.org/drm...

[cascardo/linux.git] / drivers / staging / rts5208 / rtsx.c

diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index e7a6ba2..c74f1b8 100644 (file)
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -313,7 +313,7 @@ int rtsx_read_pci_cfg_byte(u8 bus, u8 dev, u8 func, u8 offset, u8 *val)
  */
 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_dev *dev = pci_get_drvdata(pci);
        struct rtsx_chip *chip;
 
        if (!dev)
@@ -348,7 +348,7 @@ static int rtsx_suspend(struct pci_dev *pci, pm_message_t state)
 
 static int rtsx_resume(struct pci_dev *pci)
 {
-       struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
+       struct rtsx_dev *dev = pci_get_drvdata(pci);
        struct rtsx_chip *chip;
 
        if (!dev)
@@ -394,7 +394,7 @@ static int rtsx_resume(struct pci_dev *pci)
 
 static void rtsx_shutdown(struct pci_dev *pci)
 {
-       struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
+       struct rtsx_dev *dev = pci_get_drvdata(pci);
        struct rtsx_chip *chip;
 
        if (!dev)
@@ -414,13 +414,11 @@ static void rtsx_shutdown(struct pci_dev *pci)
                pci_disable_msi(pci);
 
        pci_disable_device(pci);
-
-       return;
 }
 
 static int rtsx_control_thread(void *__dev)
 {
-       struct rtsx_dev *dev = (struct rtsx_dev *)__dev;
+       struct rtsx_dev *dev = __dev;
        struct rtsx_chip *chip = dev->chip;
        struct Scsi_Host *host = rtsx_to_host(dev);
 
@@ -529,7 +527,7 @@ SkipForAbort:
 
 static int rtsx_polling_thread(void *__dev)
 {
-       struct rtsx_dev *dev = (struct rtsx_dev *)__dev;
+       struct rtsx_dev *dev = __dev;
        struct rtsx_chip *chip = dev->chip;
        struct sd_info *sd_card = &(chip->sd_card);
        struct xd_info *xd_card = &(chip->xd_card);
@@ -598,8 +596,7 @@ static irqreturn_t rtsx_interrupt(int irq, void *dev_id)
                spin_unlock(&dev->reg_lock);
                if (chip->int_reg == 0xFFFFFFFF)
                        return IRQ_HANDLED;
-               else
-                       return IRQ_NONE;
+               return IRQ_NONE;
        }
 
        status = chip->int_reg;
@@ -1017,7 +1014,7 @@ errout:
 
 static void rtsx_remove(struct pci_dev *pci)
 {
-       struct rtsx_dev *dev = (struct rtsx_dev *)pci_get_drvdata(pci);
+       struct rtsx_dev *dev = pci_get_drvdata(pci);
 
        dev_info(&pci->dev, "rtsx_remove() called\n");