From patchwork Sun Jan 11 16:17:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Klimov X-Patchwork-Id: 17820 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 1B1E3DDF59 for ; Mon, 12 Jan 2009 03:17:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752689AbZAKQR1 (ORCPT ); Sun, 11 Jan 2009 11:17:27 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752643AbZAKQR0 (ORCPT ); Sun, 11 Jan 2009 11:17:26 -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 S1752556AbZAKQRZ (ORCPT ); Sun, 11 Jan 2009 11:17:25 -0500 Received: by ug-out-1314.google.com with SMTP id 39so149684ugf.37 for ; Sun, 11 Jan 2009 08:17:24 -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=HwyYyiE5en7W3nabylekYzIn2LvtvWqCgkGal9wrrJ8=; b=ajh3UY8XVGxhv0HO6FsBpPh/mVgPiur67W7TSfAQqpHVHRykXvK+Qg5zX97sjtpLJP St0jfTxRQEGiPRqyOc/g+QsOqmoPnm2Mljt006YKXV9prDdgKAisAimmvAb06m3Ewx53 BrVkkZZ3T4B9/J6lQaOQo78uVQkRmAV0JxqF4= 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=F2qt4sMF8w0UhUNFITXXocNYY/pNHWqAh1ia2PFDOQzRhVnTsKJbxrH7zfCavjkNVG mLZR0t4VurOhAsAViAjD0mL2UlDQ/BrYqT9Fti5w/nRzVU6179DEh4UraG3SygfZkTEZ lFjH8BA4Kk0gVToQPShHRnf4W93PBFFxmPFfQ= Received: by 10.67.92.10 with SMTP id u10mr735564ugl.21.1231690644208; Sun, 11 Jan 2009 08:17:24 -0800 (PST) Received: from ?192.168.1.103? (gw.zunet.ru [217.67.117.64]) by mx.google.com with ESMTPS id p32sm32690494ugc.42.2009.01.11.08.17.22 (version=SSLv3 cipher=RC4-MD5); Sun, 11 Jan 2009 08:17:23 -0800 (PST) Subject: [patch review 3/3] net/usb: rtl8150.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:17:15 +0300 Message-Id: <1231690635.2050.107.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 --- Remove err-messages and place dev_err there. Signed-off-by: Alexey Klimov diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index d8664bf..ae19675 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -247,7 +247,8 @@ static int async_set_registers(rtl8150_t * dev, u16 indx, u16 size) if ((ret = usb_submit_urb(dev->ctrl_urb, GFP_ATOMIC))) { if (ret == -ENODEV) netif_device_detach(dev->netdev); - err("control request submission failed: %d", ret); + dev_err(&dev->udev->dev, + "control request submission failed: %d\n", ret); } else set_bit(RX_REG_SET, &dev->flags); @@ -599,7 +600,8 @@ resubmit: if (res == -ENODEV) netif_device_detach(dev->netdev); else if (res) - err ("can't resubmit intr, %s-%s/input0, status %d", + dev_err(&dev->udev->dev, + "can't resubmit intr, %s-%s/input0, status %d\n", dev->udev->bus->bus_name, dev->udev->devpath, res); } @@ -906,7 +908,7 @@ static int rtl8150_probe(struct usb_interface *intf, netdev = alloc_etherdev(sizeof(rtl8150_t)); if (!netdev) { - err("Out of memory"); + dev_err(&intf->dev, "Out of memory\n"); return -ENOMEM; } @@ -936,11 +938,11 @@ static int rtl8150_probe(struct usb_interface *intf, dev->intr_interval = 100; /* 100ms */ if (!alloc_all_urbs(dev)) { - err("out of memory"); + dev_err(&intf->dev, "out of memory\n"); goto out; } if (!rtl8150_reset(dev)) { - err("couldn't reset the device"); + dev_err(&intf->dev, "couldn't reset the device\n"); goto out1; } fill_skb_pool(dev); @@ -949,7 +951,7 @@ static int rtl8150_probe(struct usb_interface *intf, usb_set_intfdata(intf, dev); SET_NETDEV_DEV(netdev, &intf->dev); if (register_netdev(netdev) != 0) { - err("couldn't register the device"); + dev_err(&intf->dev, "couldn't register the device\n"); goto out2; }