From patchwork Wed Mar 25 06:57:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frank.blaschka@de.ibm.com X-Patchwork-Id: 25047 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 A8310DDFCE for ; Wed, 25 Mar 2009 17:58:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756202AbZCYG6V (ORCPT ); Wed, 25 Mar 2009 02:58:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756133AbZCYG6R (ORCPT ); Wed, 25 Mar 2009 02:58:17 -0400 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 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate2.de.ibm.com (8.13.1/8.13.1) with ESMTP id n2P6w9L1031933; Wed, 25 Mar 2009 06:58:09 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n2P6w9Ak2621632; Wed, 25 Mar 2009 07:58:09 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n2P6w8s3027503; Wed, 25 Mar 2009 07:58:09 +0100 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n2P6w850027500; Wed, 25 Mar 2009 07:58:08 +0100 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 24631) id C8A64122422D; Wed, 25 Mar 2009 07:58:08 +0100 (CET) Message-Id: <20090325065808.703907000@de.ibm.com> User-Agent: quilt/0.47-1 Date: Wed, 25 Mar 2009 07:57:14 +0100 From: frank.blaschka@de.ibm.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, Martin Schwidefsky , Greg Kroah-Hartman , Kay Sievers , Heiko Carstens Subject: [patch 1/6] [PATCH] qeth: struct device - replace bus_id with dev_name(), dev_set_name() References: <20090325065713.054133000@de.ibm.com> Content-Disposition: inline; filename=605-qeth-struct-device.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)) {