From patchwork Mon Feb 28 14:05:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jamie Iles X-Patchwork-Id: 84842 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 02159B70CC for ; Tue, 1 Mar 2011 01:05:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754250Ab1B1OF3 (ORCPT ); Mon, 28 Feb 2011 09:05:29 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:65385 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754243Ab1B1OF2 (ORCPT ); Mon, 28 Feb 2011 09:05:28 -0500 Received: by fxm17 with SMTP id 17so3749211fxm.19 for ; Mon, 28 Feb 2011 06:05:27 -0800 (PST) Received: by 10.223.100.8 with SMTP id w8mr3591969fan.55.1298901927386; Mon, 28 Feb 2011 06:05:27 -0800 (PST) Received: from localhost (ip-87-86-252-34.easynet.co.uk [87.86.252.34]) by mx.google.com with ESMTPS id n2sm1563955fam.4.2011.02.28.06.05.26 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 28 Feb 2011 06:05:27 -0800 (PST) From: Jamie Iles To: netdev@vger.kernel.org Cc: Jamie Iles , Nicolas Ferre Subject: [PATCH] macb: don't use platform_set_drvdata() on a net_device Date: Mon, 28 Feb 2011 14:05:25 +0000 Message-Id: <1298901925-16525-1-git-send-email-jamie@jamieiles.com> X-Mailer: git-send-email 1.7.4 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 71d6429 (Driver core: convert platform_{get,set}_drvdata to static inline functions) now triggers a warning in the macb network driver: CC drivers/net/macb.o drivers/net/macb.c: In function ‘macb_mii_init’: drivers/net/macb.c:263: warning: passing argument 1 of ‘platform_set_drvdata’ from incompatible pointer type include/linux/platform_device.h:138: note: expected ‘struct platform_device *’ but argument is of type ‘struct net_device *’ Use dev_set_drvdata() on the device embedded in the net_device instead. Cc: Nicolas Ferre Signed-off-by: Jamie Iles --- drivers/net/macb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/macb.c b/drivers/net/macb.c index f69e73e..79ccb54 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -260,7 +260,7 @@ static int macb_mii_init(struct macb *bp) for (i = 0; i < PHY_MAX_ADDR; i++) bp->mii_bus->irq[i] = PHY_POLL; - platform_set_drvdata(bp->dev, bp->mii_bus); + dev_set_drvdata(&bp->dev->dev, bp->mii_bus); if (mdiobus_register(bp->mii_bus)) goto err_out_free_mdio_irq;