include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / video / usbvision / usbvision-i2c.c

diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index dd2f8f2..0837652 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -27,9 +27,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
-#include <linux/version.h>
-#include <linux/utsname.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include <linux/ioport.h>
@@ -217,8 +214,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
        memcpy(&usbvision->i2c_adap, &i2c_adap_template,
               sizeof(struct i2c_adapter));
 
-       sprintf(usbvision->i2c_adap.name + strlen(usbvision->i2c_adap.name),
-               " #%d", usbvision->vdev->num);
+       sprintf(usbvision->i2c_adap.name, "%s-%d-%s", i2c_adap_template.name,
+               usbvision->dev->bus->busnum, usbvision->dev->devpath);
        PDEBUG(DBG_I2C,"Adaptername: %s", usbvision->i2c_adap.name);
        usbvision->i2c_adap.dev.parent = &usbvision->dev->dev;
 
@@ -247,8 +244,9 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
        switch (usbvision_device_data[usbvision->DevModel].Codec) {
        case CODEC_SAA7113:
        case CODEC_SAA7111:
-               v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "saa7115",
-                               "saa7115_auto", saa711x_addrs);
+               v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
+                               &usbvision->i2c_adap, "saa7115",
+                               "saa7115_auto", 0, saa711x_addrs);
                break;
        }
        if (usbvision_device_data[usbvision->DevModel].Tuner == 1) {
@@ -256,14 +254,16 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision)
                enum v4l2_i2c_tuner_type type;
                struct tuner_setup tun_setup;
 
-               sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner",
-                               "tuner", v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+               sd = v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
+                               &usbvision->i2c_adap, "tuner",
+                               "tuner", 0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                /* depending on whether we found a demod or not, select
                   the tuner type. */
                type = sd ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
 
-               sd = v4l2_i2c_new_probed_subdev(&usbvision->i2c_adap, "tuner",
-                               "tuner", v4l2_i2c_tuner_addrs(type));
+               sd = v4l2_i2c_new_subdev(&usbvision->v4l2_dev,
+                               &usbvision->i2c_adap, "tuner",
+                               "tuner", 0, v4l2_i2c_tuner_addrs(type));
 
                if (usbvision->tuner_type != -1) {
                        tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;