Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[sfrench/cifs-2.6.git] / drivers / media / dvb / dvb-usb / gp8psk.c

diff --git a/drivers/media/dvb/dvb-usb/gp8psk.c b/drivers/media/dvb/dvb-usb/gp8psk.c
index 92147ee3e14ffe69a134f5bfea59df244a951c51..9a942afaf0af8d1a3c16cf9e5681656d3c1eca72 100644 (file)
--- a/drivers/media/dvb/dvb-usb/gp8psk.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk.c
@@ -22,6 +22,8 @@ int dvb_usb_gp8psk_debug;
 module_param_named(debug,dvb_usb_gp8psk_debug, int, 0644);
 MODULE_PARM_DESC(debug, "set debugging level (1=info,xfer=2,rc=4 (or-able))." DVB_USB_DEBUG_STATUS);
 
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
 int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen)
 {
        int ret = 0,try = 0;
@@ -171,22 +173,6 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)
        return 0;
 }
 
-int gp8psk_bcm4500_reload(struct dvb_usb_device *d)
-{
-       u8 buf;
-       int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct);
-       /* Turn off 8psk power */
-       if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1))
-               return -EINVAL;
-       /* Turn On 8psk power */
-       if (gp8psk_usb_in_op(d, BOOT_8PSK, 1, 0, &buf, 1))
-               return -EINVAL;
-       /* load BCM4500 firmware */
-       if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM)
-               if (gp8psk_load_bcm4500fw(d))
-                       return EINVAL;
-       return 0;
-}
 
 static int gp8psk_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
@@ -206,7 +192,8 @@ static int gp8psk_usb_probe(struct usb_interface *intf,
 {
        int ret;
        struct usb_device *udev = interface_to_usbdev(intf);
-       ret =  dvb_usb_device_init(intf,&gp8psk_properties,THIS_MODULE,NULL);
+       ret = dvb_usb_device_init(intf, &gp8psk_properties,
+                                 THIS_MODULE, NULL, adapter_nr);
        if (ret == 0) {
                info("found Genpix USB device pID = %x (hex)",
                        le16_to_cpu(udev->descriptor.idProduct));