Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59da381e authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

PCI: move enum pcie_link_width into pci.h 



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: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 343e51ae

include/linux/pci.h

+13 −0
Original line number Diff line number Diff line
@@ -183,6 +183,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,

include/linux/pci_hotplug.h

+0 −13
Original line number Diff line number Diff line
@@ -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