From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763761AbYEWCsm (ORCPT ); Thu, 22 May 2008 22:48:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762852AbYEWCsb (ORCPT ); Thu, 22 May 2008 22:48:31 -0400 Received: from ozlabs.org ([203.10.76.45]:59360 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762543AbYEWCsY (ORCPT ); Thu, 22 May 2008 22:48:24 -0400 To: linux-kernel@vger.kernel.org From: Rusty Russell Date: Thu, 22 May 2008 21:48:10 -0500 Subject: [PATCH 2/3] virtio: virtio_pci should not set bus_id. Cc: Christian Borntraeger , Martin Schwidefsky , Carsten Otte , Heiko Carstens , Chris Lalancette , Anthony Liguori , virtualization@lists.linux-foundation.org Cc: Martin Schwidefsky Cc: Carsten Otte Cc: Heiko Carstens Cc: Chris Lalancette Cc: Anthony Liguori MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200805231248.11321.rusty@rustcorp.com.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The common virtio code sets the bus_id, overriding anything virtio_pci sets anyway. Signed-off-by: Rusty Russell Cc: Christian Borntraeger Cc: Martin Schwidefsky Cc: Carsten Otte Cc: Heiko Carstens Cc: Chris Lalancette Cc: Anthony Liguori --- drivers/virtio/virtio_pci.c | 1 - 1 file changed, 1 deletion(-) diff -r 2f0d0ce2adbf drivers/virtio/virtio_pci.c --- a/drivers/virtio/virtio_pci.c Fri May 23 11:55:02 2008 +1000 +++ b/drivers/virtio/virtio_pci.c Fri May 23 12:23:39 2008 +1000 @@ -325,7 +322,6 @@ static int __devinit virtio_pci_probe(st if (vp_dev == NULL) return -ENOMEM; - snprintf(vp_dev->vdev.dev.bus_id, BUS_ID_SIZE, "virtio%d", dev_index); vp_dev->vdev.index = dev_index; dev_index++;