Revert "[media] go7007-usb: only use go->dev after allocated"

This patch conflicts with commits 66a528c1c3d6, with also fixes the
bug and got merged on v3.13-rc2.

This reverts commit c61c3094a630b2f795addc3a74fbd5ff7f704ca9.

diff --git a/drivers/staging/media/go7007/go7007-usb.c b/drivers/staging/media/go7007/go7007-usb.c
index 1d747de6dfa6aab67773430e3afd474633967b17..58684da45e6c2927cb042ceb0dc4a364b3037a5c 100644 (file)
--- a/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@ -1057,7 +1057,7 @@ static int go7007_usb_probe(struct usb_interface *intf,
        char *name;
        int video_pipe, i, v_urb_len;
 
-       printk(KERN_DEBUG "go7007-usb: probing new board\n");
+       dev_dbg(go->dev, "probing new GO7007 USB board\n");
 
        switch (id->driver_info) {
        case GO7007_BOARDID_MATRIX_II:
@@ -1097,16 +1097,13 @@ static int go7007_usb_probe(struct usb_interface *intf,
                board = &board_px_tv402u;
                break;
        case GO7007_BOARDID_LIFEVIEW_LR192:
-               printk(KERN_ERR
-                      "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
+               dev_err(go->dev, "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
                return -ENODEV;
-#if 0
                name = "Lifeview TV Walker Ultra";
                board = &board_lifeview_lr192;
                break;
-#endif
        case GO7007_BOARDID_SENSORAY_2250:
-               printk(KERN_INFO "Sensoray 2250 found\n");
+               dev_info(go->dev, "Sensoray 2250 found\n");
                name = "Sensoray 2250/2251";
                board = &board_sensoray_2250;
                break;
@@ -1115,9 +1112,8 @@ static int go7007_usb_probe(struct usb_interface *intf,
                board = &board_ads_usbav_709;
                break;
        default:
-               printk(KERN_ERR
-                      "unknown board ID %d!\n",
-                      (unsigned int)id->driver_info);
+               dev_err(go->dev, "unknown board ID %d!\n",
+                               (unsigned int)id->driver_info);
                return -ENODEV;
        }