From patchwork Thu Jul 22 04:11:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 59541 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 6C7901007D1 for ; Thu, 22 Jul 2010 14:11:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753219Ab0GVELB (ORCPT ); Thu, 22 Jul 2010 00:11:01 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:37208 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752064Ab0GVELA (ORCPT ); Thu, 22 Jul 2010 00:11:00 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 8C4EF24C090; Wed, 21 Jul 2010 21:11:16 -0700 (PDT) Date: Wed, 21 Jul 2010 21:11:16 -0700 (PDT) Message-Id: <20100721.211116.98027768.davem@davemloft.net> To: sfr@canb.auug.org.au Cc: netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, richardcochran@gmail.com, florian@openwrt.org Subject: Re: linux-next: build warning after merge of the nettree From: David Miller In-Reply-To: <20100722120639.cc8d56a5.sfr@canb.auug.org.au> References: <20100722120639.cc8d56a5.sfr@canb.auug.org.au> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stephen Rothwell Date: Thu, 22 Jul 2010 12:06:39 +1000 > After merging the net tree, today's linux-next build (x86_64 allmodconfig) > produced this warning: > > drivers/net/r6040.c: In function 'r6040_ioctl': > drivers/net/r6040.c:513: warning: passing argument 2 of 'phy_mii_ioctl' from incompatible pointer type > include/linux/phy.h:522: note: expected 'struct ifreq *' but argument is of type 'struct mii_ioctl_data *' > > Introduced by commit 28b041139e344ecd0f144d6205b004ae354cfa1e ("net: > preserve ifreq parameter when calling generic phy_mii_ioctl()") (which > changed the phy_mii_ioctl() API) interacting with commit > 3831861b4ad8fd0ad7110048eb3e155628799d2b ("r6040: implement phylib") > (which added a use of that function). Thanks Stephen, should be fixed as follows: -------------------- r6040: Fix args to phy_mii_ioctl(). Reported by Stephen Rothwell. Signed-off-by: David S. Miller --- drivers/net/r6040.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 7d482a2..142c381 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -510,7 +510,7 @@ static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (!lp->phydev) return -EINVAL; - return phy_mii_ioctl(lp->phydev, if_mii(rq), cmd); + return phy_mii_ioctl(lp->phydev, rq, cmd); } static int r6040_rx(struct net_device *dev, int limit)