Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / crystalhd / crystalhd_lnx.c

diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c
index 28c6b8ced424cec2e2f3d54ac495f61fda6941da..719e70bc871e733ad602be176705feb13d0972e8 100644 (file)
--- a/drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/drivers/staging/crystalhd/crystalhd_lnx.c
@@ -516,7 +516,7 @@ static void __devexit chd_dec_pci_remove(struct pci_dev *pdev)
 
        BCMLOG_ENTER;
 
-       pinfo = (struct crystalhd_adp *) pci_get_drvdata(pdev);
+       pinfo = pci_get_drvdata(pdev);
        if (!pinfo) {
                BCMLOG_ERR("could not get adp\n");
                return;
@@ -626,7 +626,7 @@ int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
        struct crystalhd_ioctl_data *temp;
        enum BC_STATUS sts = BC_STS_SUCCESS;
 
-       adp = (struct crystalhd_adp *)pci_get_drvdata(pdev);
+       adp = pci_get_drvdata(pdev);
        if (!adp) {
                BCMLOG_ERR("could not get adp\n");
                return -ENODEV;
@@ -660,7 +660,7 @@ int chd_dec_pci_resume(struct pci_dev *pdev)
        enum BC_STATUS sts = BC_STS_SUCCESS;
        int rc;
 
-       adp = (struct crystalhd_adp *)pci_get_drvdata(pdev);
+       adp = pci_get_drvdata(pdev);
        if (!adp) {
                BCMLOG_ERR("could not get adp\n");
                return -ENODEV;