| Message ID | 1375102331-23905-10-git-send-email-jeffrey.t.kirsher@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Mon, Jul 29, 2013 at 6:52 AM, Jeff Kirsher <jeffrey.t.kirsher@intel.com> wrote: > From: Jacob Keller <jacob.e.keller@intel.com> > > pcie_link_width is the enum used to define the link width values for a pcie > device. This enum should not be contained solely in pci_hotplug.h, and this > patch moves it next to pci_bus_speed in pci.h > > Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> > Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> > --- > include/linux/pci.h | 13 +++++++++++++ > include/linux/pci_hotplug.h | 13 ------------- > 2 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 95ff993..fc2d1fb 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -186,6 +186,19 @@ enum pci_bus_flags { > PCI_BUS_FLAGS_NO_MMRBC = (__force pci_bus_flags_t) 2, > }; > > +/* These values come from the PCI Express Spec */ > +enum pcie_link_width { > + PCIE_LNK_WIDTH_RESRV = 0x00, > + PCIE_LNK_X1 = 0x01, > + PCIE_LNK_X2 = 0x02, > + PCIE_LNK_X4 = 0x04, > + PCIE_LNK_X8 = 0x08, > + PCIE_LNK_X12 = 0x0C, > + PCIE_LNK_X16 = 0x10, > + PCIE_LNK_X32 = 0x20, > + PCIE_LNK_WIDTH_UNKNOWN = 0xFF, > +}; > + > /* Based on the PCI Hotplug Spec, but some values are made up by us */ > enum pci_bus_speed { > PCI_SPEED_33MHz = 0x00, > diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h > index 8db71dc..64e61e0 100644 > --- a/include/linux/pci_hotplug.h > +++ b/include/linux/pci_hotplug.h > @@ -28,19 +28,6 @@ > #ifndef _PCI_HOTPLUG_H > #define _PCI_HOTPLUG_H > > -/* These values come from the PCI Express Spec */ > -enum pcie_link_width { > - PCIE_LNK_WIDTH_RESRV = 0x00, > - PCIE_LNK_X1 = 0x01, > - PCIE_LNK_X2 = 0x02, > - PCIE_LNK_X4 = 0x04, > - PCIE_LNK_X8 = 0x08, > - PCIE_LNK_X12 = 0x0C, > - PCIE_LNK_X16 = 0x10, > - PCIE_LNK_X32 = 0x20, > - PCIE_LNK_WIDTH_UNKNOWN = 0xFF, > -}; > - > /** > * struct hotplug_slot_ops -the callbacks that the hotplug pci core can use > * @owner: The module owner of this structure > -- > 1.7.11.7 > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/pci.h b/include/linux/pci.h index 95ff993..fc2d1fb 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -186,6 +186,19 @@ enum pci_bus_flags { PCI_BUS_FLAGS_NO_MMRBC = (__force pci_bus_flags_t) 2, }; +/* These values come from the PCI Express Spec */ +enum pcie_link_width { + PCIE_LNK_WIDTH_RESRV = 0x00, + PCIE_LNK_X1 = 0x01, + PCIE_LNK_X2 = 0x02, + PCIE_LNK_X4 = 0x04, + PCIE_LNK_X8 = 0x08, + PCIE_LNK_X12 = 0x0C, + PCIE_LNK_X16 = 0x10, + PCIE_LNK_X32 = 0x20, + PCIE_LNK_WIDTH_UNKNOWN = 0xFF, +}; + /* Based on the PCI Hotplug Spec, but some values are made up by us */ enum pci_bus_speed { PCI_SPEED_33MHz = 0x00, diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h index 8db71dc..64e61e0 100644 --- a/include/linux/pci_hotplug.h +++ b/include/linux/pci_hotplug.h @@ -28,19 +28,6 @@ #ifndef _PCI_HOTPLUG_H #define _PCI_HOTPLUG_H -/* These values come from the PCI Express Spec */ -enum pcie_link_width { - PCIE_LNK_WIDTH_RESRV = 0x00, - PCIE_LNK_X1 = 0x01, - PCIE_LNK_X2 = 0x02, - PCIE_LNK_X4 = 0x04, - PCIE_LNK_X8 = 0x08, - PCIE_LNK_X12 = 0x0C, - PCIE_LNK_X16 = 0x10, - PCIE_LNK_X32 = 0x20, - PCIE_LNK_WIDTH_UNKNOWN = 0xFF, -}; - /** * struct hotplug_slot_ops -the callbacks that the hotplug pci core can use * @owner: The module owner of this structure