From patchwork Tue Nov 18 06:29:58 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 9345 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 9A247DDDEE for ; Tue, 18 Nov 2008 17:30:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750888AbYKRGaF (ORCPT ); Tue, 18 Nov 2008 01:30:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750866AbYKRGaE (ORCPT ); Tue, 18 Nov 2008 01:30:04 -0500 Received: from mail.renesas.com ([202.234.163.13]:41098 "EHLO mail01.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750761AbYKRGaA (ORCPT ); Tue, 18 Nov 2008 01:30:00 -0500 X-AuditID: ac140384-00000009000004f6-79-492260e6104f Received: from guardian02.idc.renesas.com ([172.20.8.201]) by mail01.idc.renesas.com (sendmail) with ESMTP id mAI6TwhA019757; Tue, 18 Nov 2008 15:29:58 +0900 (JST) Received: (from root@localhost) by guardian02.idc.renesas.com with id mAI6TwYD015900; Tue, 18 Nov 2008 15:29:58 +0900 (JST) Received: from mta03.idc.renesas.com (localhost [127.0.0.1]) by mta03.idc.renesas.com with ESMTP id mAI6U0aR012902; Tue, 18 Nov 2008 15:30:00 +0900 (JST) Received: from [172.30.8.158] by ims05.idc.renesas.com (Sendmail) with ESMTPA id <0KAI00159NDYHT@ims05.idc.renesas.com>; Tue, 18 Nov 2008 15:29:58 +0900 (JST) Date: Tue, 18 Nov 2008 15:29:58 +0900 From: Nobuhiro Iwamatsu Subject: [PATCH v2.6.28] sh: sh_eth: Update to change of mii_bus To: netdev@vger.kernel.org Cc: Linux-sh Message-id: <492260E6.5010305@renesas.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-2022-JP Content-transfer-encoding: 7bit User-Agent: Thunderbird 1.5.0.14 (Windows/20071210) X-Brightmail-Tracker: AAAAAA== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Update to change of mii_bus interface and fix some warning. Signed-off-by: Nobuhiro Iwamatsu --- drivers/net/sh_eth.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index a24bb68..59f242a 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -927,7 +927,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev) struct sh_eth_private *mdp = netdev_priv(ndev); struct sh_eth_txdesc *txdesc; u32 entry; - int flags; + unsigned long flags; spin_lock_irqsave(&mdp->lock, flags); if ((mdp->cur_tx - mdp->dirty_tx) >= (TX_RING_SIZE - 4)) { @@ -1141,7 +1141,7 @@ static int sh_mdio_init(struct net_device *ndev, int id) /* Hook up MII support for ethtool */ mdp->mii_bus->name = "sh_mii"; mdp->mii_bus->parent = &ndev->dev; - mdp->mii_bus->id[0] = id; + snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%x", id); /* PHY IRQ */ mdp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL);