]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
[media] az6007: Simplify the code by removing an uneeded function
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 25 Jul 2011 15:49:46 +0000 (12:49 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 21 Jan 2012 15:45:49 +0000 (13:45 -0200)
Everything to reset the demod is already at
az6007_frontend_poweron().

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb/az6007.c

index 8add81ade08797b3bbc0fa4bd0dbfad7840eec13..912ba67bc393b53ad020022a4d467468928dfc5d 100644 (file)
@@ -259,34 +259,6 @@ error:
        return ret;
 }
 
-static int az6007_frontend_reset(struct dvb_usb_adapter *adap)
-{
-       struct usb_device *udev = adap->dev->udev;
-       int ret;
-
-       deb_info("az6007_frontend_reset adap=%p adap->dev=%p\n", adap, adap->dev);
-
-       /* reset demodulator */
-       ret = az6007_write(udev, FX2_SCON1, 1, 3, NULL, 0);
-       if (ret < 0)
-               goto error;
-       msleep(200);
-       ret = az6007_write(udev, FX2_SCON1, 0, 3, NULL, 0);
-       if (ret < 0)
-               goto error;
-       msleep(200);
-       ret = az6007_write(udev, FX2_SCON1, 1, 3, NULL, 0);
-       if (ret < 0)
-               goto error;
-       msleep(200);
-
-error:
-       if (ret < 0)
-               err("%s failed with error %d", __func__, ret);
-
-       return ret;
-}
-
 static int az6007_led_on_off(struct usb_interface *intf, int onoff)
 {
        struct usb_device *udev = interface_to_usbdev(intf);
@@ -309,7 +281,6 @@ static int az6007_frontend_attach(struct dvb_usb_adapter *adap)
        BUG_ON(!st);
 
        az6007_frontend_poweron(adap);
-       az6007_frontend_reset(adap);
 
        info("az6007: attaching demod drxk");
        adap->fe = dvb_attach(drxk_attach, &terratec_h7_drxk,