From patchwork Sun Jan 11 16:16:31 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Klimov X-Patchwork-Id: 17818 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 206B4DDF59 for ; Mon, 12 Jan 2009 03:17:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752390AbZAKQQ5 (ORCPT ); Sun, 11 Jan 2009 11:16:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752363AbZAKQQ4 (ORCPT ); Sun, 11 Jan 2009 11:16:56 -0500 Received: from ug-out-1314.google.com ([66.249.92.174]:28809 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752177AbZAKQQz (ORCPT ); Sun, 11 Jan 2009 11:16:55 -0500 Received: by ug-out-1314.google.com with SMTP id 39so149684ugf.37 for ; Sun, 11 Jan 2009 08:16:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=S/cFNbnIk+US0T7CRYEmw5cFYE0btTyY8YWsHnBXB1M=; b=QrobFwdkGVLBsG+b3XBcE0DBUOZ2XHjJ1XphFi/aYlq4fnnRAM+XqXQScoD2oNiREi GFsOL7L6AIN7s+e+MVgh2MNADvtCrqYuIAvUAVWQ43kjwtZBcZbyLC44bK1i8YIoikCP QTjA24sn9Ax4UgqHtN18mFUTDiWMSM19LeFQY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=LWEwpMFu62jHwVcBglcj1xGeBFjF7260Z3q2HfJaZ/XbKLhUG8e50pQTnB9gfOT72G yJq8LVcVrYA3NdT6T1PxuI3/O5rdIWxNeQFTmBvGHgL+c5x+Ok6piKihDEwY1DGbT7KG UInK1OTX+vRWBAqfU+gplZL65/AYsA31x3gKw= Received: by 10.67.119.20 with SMTP id w20mr723258ugm.78.1231690612573; Sun, 11 Jan 2009 08:16:52 -0800 (PST) Received: from ?192.168.1.103? (gw.zunet.ru [217.67.117.64]) by mx.google.com with ESMTPS id m38sm32665371ugd.46.2009.01.11.08.16.50 (version=SSLv3 cipher=RC4-MD5); Sun, 11 Jan 2009 08:16:51 -0800 (PST) Subject: [patch review 1/3] net/usb: catc.c - place dev_err instead of err() From: Alexey Klimov To: dbrownell@users.sourceforge.net, davem@davemloft.net Cc: Greg KH , netdev@vger.kernel.org, linux-usb@vger.kernel.org Date: Sun, 11 Jan 2009 19:16:31 +0300 Message-Id: <1231690591.2050.103.camel@tux.localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hello, there are 3 patches for usb-network drivers that use err macroses. Probably, few mistakes exist in this 3 patches and they should be reformatted. May be they should be joined in one patch. Please, review. --- Remove err-messages and place dev_err there. Signed-off-by: Alexey Klimov -- diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index cb7acbb..e23fa80 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c @@ -339,14 +339,14 @@ static void catc_irq_done(struct urb *urb) } else { catc->rx_urb->dev = catc->usbdev; if ((res = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) { - err("submit(rx_urb) status %d", res); + dev_err(&urb->dev->dev, "submit(rx_urb) status %d\n", res); } } } resubmit: res = usb_submit_urb (urb, GFP_ATOMIC); if (res) - err ("can't resubmit intr, %s-%s, status %d", + dev_err(&urb->dev->dev,"can't resubmit intr, %s-%s, status %d\n", catc->usbdev->bus->bus_name, catc->usbdev->devpath, res); } @@ -367,7 +367,7 @@ static int catc_tx_run(struct catc *catc) catc->tx_urb->dev = catc->usbdev; if ((status = usb_submit_urb(catc->tx_urb, GFP_ATOMIC)) < 0) - err("submit(tx_urb), status %d", status); + dev_err(&catc->usbdev->dev, "submit(tx_urb), status %d\n", status); catc->tx_idx = !catc->tx_idx; catc->tx_ptr = 0; @@ -496,7 +496,7 @@ static void catc_ctrl_run(struct catc *catc) memcpy(catc->ctrl_buf, q->buf, q->len); if ((status = usb_submit_urb(catc->ctrl_urb, GFP_KERNEL))) - err("submit(ctrl_urb) status %d", status); + dev_err(&usbdev->dev, "submit(ctrl_urb) status %d\n", status); } static void catc_ctrl_done(struct urb *urb) @@ -555,7 +555,7 @@ static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value, catc->ctrl_head = (catc->ctrl_head + 1) & (CTRL_QUEUE - 1); if (catc->ctrl_head == catc->ctrl_tail) { - err("ctrl queue full"); + dev_err(&catc->usbdev->dev, "ctrl queue full\n"); catc->ctrl_tail = (catc->ctrl_tail + 1) & (CTRL_QUEUE - 1); retval = -1; } @@ -721,7 +721,7 @@ static int catc_open(struct net_device *netdev) catc->irq_urb->dev = catc->usbdev; if ((status = usb_submit_urb(catc->irq_urb, GFP_KERNEL)) < 0) { - err("submit(irq_urb) status %d", status); + dev_err(&netdev->dev, "submit(irq_urb) status %d\n", status); return -1; } @@ -764,7 +764,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id if (usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 1)) { - err("Can't set altsetting 1."); + dev_err(&intf->dev, "Can't set altsetting 1.\n"); return -EIO; } @@ -799,7 +799,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id catc->irq_urb = usb_alloc_urb(0, GFP_KERNEL); if ((!catc->ctrl_urb) || (!catc->tx_urb) || (!catc->rx_urb) || (!catc->irq_urb)) { - err("No free urbs available."); + dev_err(&intf->dev, "No free urbs available.\n"); usb_free_urb(catc->ctrl_urb); usb_free_urb(catc->tx_urb); usb_free_urb(catc->rx_urb);