Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933222AbbDITMo (ORCPT ); Thu, 9 Apr 2015 15:12:44 -0400 Received: from mail-ob0-f177.google.com ([209.85.214.177]:35873 "EHLO mail-ob0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933120AbbDITMj (ORCPT ); Thu, 9 Apr 2015 15:12:39 -0400 Date: Thu, 9 Apr 2015 14:12:35 -0500 From: Bjorn Helgaas To: "Michael S. Tsirkin" Cc: linux-kernel@vger.kernel.org, Jonathan Corbet , linux-pci@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH] pci.txt: clarify vendor ID policy Message-ID: <20150409191235.GI30967@google.com> References: <1427704341-14125-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1427704341-14125-1-git-send-email-mst@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2436 Lines: 57 On Mon, Mar 30, 2015 at 10:32:34AM +0200, Michael S. Tsirkin wrote: > Top of include/linux/pci_ids.h says: > Do not add new entries to this file unless the definitions > are shared between multiple drivers. > on the other hand, Documentation/PCI/pci.txt seems to imply that all > vendor IDs should be added in include/linux/pci_ids.h. > > Clarify text pci.txt to avoid the apparent contradiction. > > Signed-off-by: Michael S. Tsirkin Applied to pci/misc for v4.1 in the following form. Thanks! commit b3d3d4d67569ad726530d8de3d7aa334c7e7465b Author: Michael S. Tsirkin Date: Mon Mar 30 10:32:34 2015 +0200 PCI: Clarify policy for vendor IDs in pci.txt Clarify pci.txt so it matches the "do not add new entries unless they are sahred between multiple drivers" comment in include/linux/pci_ids.h. [bhelgaas: changelog, strengthen language] Signed-off-by: Michael S. Tsirkin Signed-off-by: Bjorn Helgaas diff --git a/Documentation/PCI/pci.txt b/Documentation/PCI/pci.txt index 9518006f6675..123881f62219 100644 --- a/Documentation/PCI/pci.txt +++ b/Documentation/PCI/pci.txt @@ -564,14 +564,14 @@ to be handled by platform and generic code, not individual drivers. 8. Vendor and device identifications ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -One is not required to add new device ids to include/linux/pci_ids.h. -Please add PCI_VENDOR_ID_xxx for vendors and a hex constant for device ids. +Do not add new device or vendor IDs to include/linux/pci_ids.h unless they +are shared across multiple drivers. You can add private definitions in +your driver if they're helpful, or just use plain hex constants. -PCI_VENDOR_ID_xxx constants are re-used. The device ids are arbitrary -hex numbers (vendor controlled) and normally used only in a single -location, the pci_device_id table. +The device IDs are arbitrary hex numbers (vendor controlled) and normally used +only in a single location, the pci_device_id table. -Please DO submit new vendor/device ids to pciids.sourceforge.net project. +Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/