From patchwork Sun Aug 9 19:54:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Slusarz X-Patchwork-Id: 31042 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 24D9DB7B6F for ; Mon, 10 Aug 2009 05:58:24 +1000 (EST) Received: by ozlabs.org (Postfix) id 19671DDD0B; Mon, 10 Aug 2009 05:58:24 +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 96DD7DDD04 for ; Mon, 10 Aug 2009 05:58:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753718AbZHITzF (ORCPT ); Sun, 9 Aug 2009 15:55:05 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753505AbZHITzF (ORCPT ); Sun, 9 Aug 2009 15:55:05 -0400 Received: from qw-out-2122.google.com ([74.125.92.27]:8562 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753365AbZHITzC (ORCPT ); Sun, 9 Aug 2009 15:55:02 -0400 Received: by qw-out-2122.google.com with SMTP id 8so1018471qwh.37 for ; Sun, 09 Aug 2009 12:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=EzzXgu23OKaaqDyjmVXB86TPFoJxqlxSsmnmKBdQ/LU=; b=eT3WpCOXKot5mnVQ/maRNfTziLZboo9iAjnzN3oJijpe9IFwtmoIW6o6IuzCh/6V4o xUX333RgeC2+3YrdQg2NTNEHtzNqFf/KtNn1TpHQvLlV7XT9VJhIuYCE6SK50fFC5WxA u6/PP6Bw90sqd5K8KIlrpq+ucTBZopTbLn4Bc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=xuU7V+AROAKa6UQN9KBdqQYpM/ctWVYVmqN/X76j4xSmZoHMkVjJcY2sLu7tW/LYgW yOv7KjHP1XZ/IB0BzvbsR6xvOrX4rcf/sgFj3m2h8YlxxCmTsLixKW/vyKAAPe7uTsnE HJInBS59Q3y4M0ciXZvWY/+Dq9fGErYJcHiC4= Received: by 10.224.45.144 with SMTP id e16mr2608054qaf.89.1249847702500; Sun, 09 Aug 2009 12:55:02 -0700 (PDT) Received: from joi ([72.14.241.8]) by mx.google.com with ESMTPS id 4sm10319333qwe.27.2009.08.09.12.54.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 09 Aug 2009 12:55:01 -0700 (PDT) Received: by joi (sSMTP sendmail emulation); Sun, 09 Aug 2009 21:54:57 +0200 From: Marcin Slusarz To: LKML Cc: netdev@vger.kernel.org Subject: [PATCH 11/14] drivers/net: use printk_once Date: Sun, 9 Aug 2009 21:54:06 +0200 Message-Id: <1249847649-11631-12-git-send-email-marcin.slusarz@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249847649-11631-1-git-send-email-marcin.slusarz@gmail.com> References: <1249847649-11631-1-git-send-email-marcin.slusarz@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Marcin Slusarz Cc: netdev@vger.kernel.org Acked-by: David S. Miller --- drivers/net/mlx4/en_main.c | 6 +----- drivers/net/mv643xx_eth.c | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) 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;