From patchwork Wed Jan 7 15:52:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumar Gala X-Patchwork-Id: 17139 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 829CCDE34A for ; Thu, 8 Jan 2009 02:54:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752359AbZAGPyP (ORCPT ); Wed, 7 Jan 2009 10:54:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751859AbZAGPyP (ORCPT ); Wed, 7 Jan 2009 10:54:15 -0500 Received: from gate.crashing.org ([63.228.1.57]:46162 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751312AbZAGPyO (ORCPT ); Wed, 7 Jan 2009 10:54:14 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.13.8) with ESMTP id n07Fq14t014878; Wed, 7 Jan 2009 09:52:01 -0600 From: Kumar Gala To: netdev@vger.kernel.org Cc: linuxppc-dev@ozlabs.org, afleming@freescale.com, davem@davemloft.net, kay.sievers@vrfy.org Subject: [PATCH] gianfar: Fixup use of BUS_ID_SIZE Date: Wed, 7 Jan 2009 09:52:01 -0600 Message-Id: <1231343521-22171-1-git-send-email-galak@kernel.crashing.org> X-Mailer: git-send-email 1.5.6.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 went back to using BUS_ID_SIZE instead of sizeof() as per the larger patch series that will remove "char bus_id[20]" from struct device. Signed-off-by: Kumar Gala --- drivers/net/gianfar.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 7fcc3af..1b8deca 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c @@ -238,8 +238,8 @@ static int gfar_of_init(struct net_device *dev) goto err_out; } - snprintf(priv->phy_bus_id, BUS_ID_SIZE, PHY_ID_FMT, "0", - fixed_link[0]); + snprintf(priv->phy_bus_id, sizeof(priv->phy_bus_id), + PHY_ID_FMT, "0", fixed_link[0]); } else { phy = of_find_node_by_phandle(*ph); @@ -256,7 +256,7 @@ static int gfar_of_init(struct net_device *dev) of_node_put(mdio); gfar_mdio_bus_name(bus_name, mdio); - snprintf(priv->phy_bus_id, BUS_ID_SIZE, "%s:%02x", + snprintf(priv->phy_bus_id, sizeof(priv->phy_bus_id), "%s:%02x", bus_name, *id); }