From patchwork Sun Aug 23 18:26:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Slusarz X-Patchwork-Id: 31880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 033D0B7257 for ; Mon, 24 Aug 2009 04:27:50 +1000 (EST) Received: by ozlabs.org (Postfix) id EA639DDD0B; Mon, 24 Aug 2009 04:27:49 +1000 (EST) 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 7D260DDD01 for ; Mon, 24 Aug 2009 04:27:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933703AbZHWS06 (ORCPT ); Sun, 23 Aug 2009 14:26:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933615AbZHWS06 (ORCPT ); Sun, 23 Aug 2009 14:26:58 -0400 Received: from mail-bw0-f219.google.com ([209.85.218.219]:38978 "EHLO mail-bw0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933514AbZHWS05 (ORCPT ); Sun, 23 Aug 2009 14:26:57 -0400 Received: by bwz19 with SMTP id 19so1150466bwz.37 for ; Sun, 23 Aug 2009 11:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:content-type :content-transfer-encoding; bh=iMX7IHk2wl344+zcVD/g7gVhTA7DQq0gzf2zQ7W0B4E=; b=PLk3tMRYE9LxsoTAfMtpkV0VEbIw2JKffzgBuEPEiAFml2gijSRDbrMHmD11o/7AXu bmZ7sOB704EY0M2zFY1//mTx+xYmzj5yxzkPhub0keEsGWTvBS3x9u9pJcMYbrWuRdFB uTeG/uuUcw3+1ISQJE5M6YnaMeQwvm21bE0Vo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=xYtC+EqJ3cFST/nvuuxLvmh/sUDK4Se5p1KKRues4a0FJJ6K+n7PvfxpQqzi7h0brn jPUkQxK0dpyoNJJ2QbaoY+W7i21+0060dHyTQ2qMimruSCVwm0Xe3xa3gTTLIIk/LtrJ XBNd74CQ2rWttn6zHj/6ICK/Gdgzj7zn8SqVY= Received: by 10.103.64.19 with SMTP id r19mr1439584muk.8.1251052017833; Sun, 23 Aug 2009 11:26:57 -0700 (PDT) Received: from ?192.168.1.104? (acet161.neoplus.adsl.tpnet.pl [83.9.195.161]) by mx.google.com with ESMTPS id j2sm18201820mue.50.2009.08.23.11.26.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 23 Aug 2009 11:26:57 -0700 (PDT) Message-ID: <4A9189F0.1000506@gmail.com> Date: Sun, 23 Aug 2009 20:26:56 +0200 From: Marcin Slusarz User-Agent: Thunderbird 2.0.0.22 (X11/20090605) MIME-Version: 1.0 To: "David S. Miller" CC: netdev@vger.kernel.org, LKML , Andrew Morton Subject: [PATCH resend] drivers/net: use printk_once Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Marcin Slusarz Subject: drivers/net: use printk_once Signed-off-by: Marcin Slusarz Acked-by: David S. Miller Cc: netdev@vger.kernel.org --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c index 9ed4a15..18e9e4f 100644 --- a/drivers/net/mlx4/en_main.c +++ b/drivers/net/mlx4/en_main.c @@ -151,15 +151,11 @@ static void mlx4_en_remove(struct mlx4_dev *dev, void *endev_ptr) static void *mlx4_en_add(struct mlx4_dev *dev) { - static int mlx4_en_version_printed; struct mlx4_en_dev *mdev; int i; int err; - if (!mlx4_en_version_printed) { - printk(KERN_INFO "%s", mlx4_en_version); - mlx4_en_version_printed++; - } + printk_once(KERN_INFO "%s", mlx4_en_version); mdev = kzalloc(sizeof *mdev, GFP_KERNEL); if (!mdev) { diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 0f32db3..dbb1d9c 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2622,14 +2622,12 @@ static void infer_hw_params(struct mv643xx_eth_shared_private *msp) static int mv643xx_eth_shared_probe(struct platform_device *pdev) { - static int mv643xx_eth_version_printed; struct mv643xx_eth_shared_platform_data *pd = pdev->dev.platform_data; struct mv643xx_eth_shared_private *msp; struct resource *res; int ret; - if (!mv643xx_eth_version_printed++) - printk(KERN_NOTICE "MV-643xx 10/100/1000 ethernet " + printk_once(KERN_NOTICE "MV-643xx 10/100/1000 ethernet " "driver version %s\n", mv643xx_eth_driver_version); ret = -EINVAL;