From mboxrd@z Thu Jan 1 00:00:00 1970 From: frank.blaschka@de.ibm.com Subject: [patch 1/6] [PATCH] qeth: struct device - replace bus_id with dev_name(), dev_set_name() Date: Wed, 25 Mar 2009 07:57:14 +0100 Message-ID: <20090325065808.703907000@de.ibm.com> References: <20090325065713.054133000@de.ibm.com> Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, Martin Schwidefsky , Greg Kroah-Hartman , Kay Sievers , Heiko Carstens To: davem@davemloft.net Return-path: Received: from mtagate2.de.ibm.com ([195.212.17.162]:54302 "EHLO mtagate2.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755498AbZCYG6M (ORCPT ); Wed, 25 Mar 2009 02:58:12 -0400 Content-Disposition: inline; filename=605-qeth-struct-device.diff Sender: netdev-owner@vger.kernel.org List-ID: From: Kay Sievers Cc: Martin Schwidefsky Acked-by: Greg Kroah-Hartman Signed-off-by: Kay Sievers Signed-off-by: Heiko Carstens Signed-off-by: Frank Blaschka --- drivers/s390/net/qeth_l3_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -urpN linux-2.6/drivers/s390/net/qeth_l3_main.c linux-2.6-patched/drivers/s390/net/qeth_l3_main.c --- linux-2.6/drivers/s390/net/qeth_l3_main.c 2009-02-18 12:06:14.000000000 +0100 +++ linux-2.6-patched/drivers/s390/net/qeth_l3_main.c 2009-02-18 12:06:31.000000000 +0100 @@ -1038,7 +1038,7 @@ static int qeth_l3_setadapter_parms(stru rc = qeth_query_setadapterparms(card); if (rc) { QETH_DBF_MESSAGE(2, "%s couldn't set adapter parameters: " - "0x%x\n", card->gdev->dev.bus_id, rc); + "0x%x\n", dev_name(&card->gdev->dev), rc); return rc; } if (qeth_adp_supported(card, IPA_SETADP_ALTER_MAC_ADDRESS)) {