[media] gspca: Use current logging styles

Add pr_fmt.
Convert usb style logging macros to pr_<level>.
Remove now unused old usb style logging macros.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/media/video/gspca/sn9c2028.c b/drivers/media/video/gspca/sn9c2028.c
index 4271f86dfe01..48aae3926a33 100644
--- a/drivers/media/video/gspca/sn9c2028.c
+++ b/drivers/media/video/gspca/sn9c2028.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define MODULE_NAME "sn9c2028"
 
 #include "gspca.h"
@@ -75,8 +77,8 @@ static int sn9c2028_command(struct gspca_dev *gspca_dev, u8 *command)
                         USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
                         2, 0, gspca_dev->usb_buf, 6, 500);
         if (rc < 0) {
-                err("command write [%02x] error %d",
-                                gspca_dev->usb_buf[0], rc);
+                pr_err("command write [%02x] error %d\n",
+                       gspca_dev->usb_buf[0], rc);
                 return rc;
         }
 
@@ -93,7 +95,7 @@ static int sn9c2028_read1(struct gspca_dev *gspca_dev)
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
                         1, 0, gspca_dev->usb_buf, 1, 500);
         if (rc != 1) {
-                err("read1 error %d", rc);
+                pr_err("read1 error %d\n", rc);
                 return (rc < 0) ? rc : -EIO;
         }
         PDEBUG(D_USBI, "read1 response %02x", gspca_dev->usb_buf[0]);
@@ -109,7 +111,7 @@ static int sn9c2028_read4(struct gspca_dev *gspca_dev, u8 *reading)
                         USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_INTERFACE,
                         4, 0, gspca_dev->usb_buf, 4, 500);
         if (rc != 4) {
-                err("read4 error %d", rc);
+                pr_err("read4 error %d\n", rc);
                 return (rc < 0) ? rc : -EIO;
         }
         memcpy(reading, gspca_dev->usb_buf, 4);
@@ -131,7 +133,7 @@ static int sn9c2028_long_command(struct gspca_dev *gspca_dev, u8 *command)
         for (i = 0; i < 256 && status < 2; i++)
                 status = sn9c2028_read1(gspca_dev);
         if (status != 2) {
-                err("long command status read error %d", status);
+                pr_err("long command status read error %d\n", status);
                 return (status < 0) ? status : -EIO;
         }
 
@@ -638,7 +640,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
                 err_code = start_vivitar_cam(gspca_dev);
                 break;
         default:
-                err("Starting unknown camera, please report this");
+                pr_err("Starting unknown camera, please report this\n");
                 return -ENXIO;
         }