diff options
author | Joe Perches <joe@perches.com> | 2011-08-21 19:56:51 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-03 21:12:17 -0300 |
commit | d650fc30c0328eceb0e48f348e01e073b5a7f1f6 (patch) | |
tree | 06b30224ec517307f515e826cd060db699c65e1f | |
parent | 857011e4d9bf47b39abcc89541a58c56e4df34be (diff) | |
download | linux-3.10-d650fc30c0328eceb0e48f348e01e073b5a7f1f6.tar.gz linux-3.10-d650fc30c0328eceb0e48f348e01e073b5a7f1f6.tar.bz2 linux-3.10-d650fc30c0328eceb0e48f348e01e073b5a7f1f6.zip |
[media] gl860: Use current logging styles
Add pr_fmt.
Convert err macro use to pr_err.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/gspca/gl860/gl860.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/video/gspca/gl860/gl860.c b/drivers/media/video/gspca/gl860/gl860.c index e8e071aa212..2ced3b73994 100644 --- a/drivers/media/video/gspca/gl860/gl860.c +++ b/drivers/media/video/gspca/gl860/gl860.c @@ -18,6 +18,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "gspca.h" #include "gl860.h" @@ -572,9 +575,8 @@ int gl860_RTx(struct gspca_dev *gspca_dev, } if (r < 0) - err("ctrl transfer failed %4d " - "[p%02x r%d v%04x i%04x len%d]", - r, pref, req, val, index, len); + pr_err("ctrl transfer failed %4d [p%02x r%d v%04x i%04x len%d]\n", + r, pref, req, val, index, len); else if (len > 1 && r < len) PDEBUG(D_ERR, "short ctrl transfer %d/%d", r, len); |