[PATCH v2] pci:ipmi: Move IPMI PCI class id defines to pci_ids.h

[PATCH v2] pci:ipmi: Move IPMI PCI class id defines to pci_ids.h

[minyard]

From: Corey Minyard <cminyard@mvista.com>

Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
 drivers/char/ipmi/ipmi_si_pci.c | 5 -----
 include/linux/pci_ids.h         | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

Changes from v1:
  * Leave PCI_DEVICE_ID_HP_MMC in the IPMI driver, per comments
    by Bjorn Helgaas.

There's no hurry on this, if it is suitable I can keep it in my
queue with your ack, or you can take it.

Thanks!

-corey

diff --git a/drivers/char/ipmi/ipmi_si_pci.c b/drivers/char/ipmi/ipmi_si_pci.c
index f54ca68..bdba128 100644
--- a/drivers/char/ipmi/ipmi_si_pci.c
+++ b/drivers/char/ipmi/ipmi_si_pci.c
@@ -18,11 +18,6 @@ module_param_named(trypci, si_trypci, bool, 0);
 MODULE_PARM_DESC(trypci, "Setting this to zero will disable the"
 		 " default scan of the interfaces identified via pci");
 
-#define PCI_CLASS_SERIAL_IPMI		0x0c07
-#define PCI_CLASS_SERIAL_IPMI_SMIC	0x0c0700
-#define PCI_CLASS_SERIAL_IPMI_KCS	0x0c0701
-#define PCI_CLASS_SERIAL_IPMI_BT	0x0c0702
-
 #define PCI_DEVICE_ID_HP_MMC 0x121A
 
 static void ipmi_pci_cleanup(struct si_sm_io *io)
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index cc608fc5..ac79652 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -117,6 +117,10 @@
 #define PCI_CLASS_SERIAL_USB_DEVICE	0x0c03fe
 #define PCI_CLASS_SERIAL_FIBER		0x0c04
 #define PCI_CLASS_SERIAL_SMBUS		0x0c05
+#define PCI_CLASS_SERIAL_IPMI		0x0c07
+#define PCI_CLASS_SERIAL_IPMI_SMIC	0x0c0700
+#define PCI_CLASS_SERIAL_IPMI_KCS	0x0c0701
+#define PCI_CLASS_SERIAL_IPMI_BT	0x0c0702
 
 #define PCI_BASE_CLASS_WIRELESS			0x0d
 #define PCI_CLASS_WIRELESS_RF_CONTROLLER	0x0d10
-- 
2.7.4

Re: [PATCH v2] pci:ipmi: Move IPMI PCI class id defines to pci_ids.h

[Bjorn Helgaas]

On Wed, Apr 18, 2018 at 12:28:47PM -0500, minyard@acm.org wrote:
> From: Corey Minyard <cminyard@mvista.com>
> 
> Signed-off-by: Corey Minyard <cminyard@mvista.com>
> ---
>  drivers/char/ipmi/ipmi_si_pci.c | 5 -----
>  include/linux/pci_ids.h         | 4 ++++
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> Changes from v1:
>   * Leave PCI_DEVICE_ID_HP_MMC in the IPMI driver, per comments
>     by Bjorn Helgaas.
> 
> There's no hurry on this, if it is suitable I can keep it in my
> queue with your ack, or you can take it.

Looks great to me, I'll assume you'll merge it.

Acked-by: Bjorn Helgaas <bhelgaas@google.com>

> diff --git a/drivers/char/ipmi/ipmi_si_pci.c b/drivers/char/ipmi/ipmi_si_pci.c
> index f54ca68..bdba128 100644
> --- a/drivers/char/ipmi/ipmi_si_pci.c
> +++ b/drivers/char/ipmi/ipmi_si_pci.c
> @@ -18,11 +18,6 @@ module_param_named(trypci, si_trypci, bool, 0);
>  MODULE_PARM_DESC(trypci, "Setting this to zero will disable the"
>  		 " default scan of the interfaces identified via pci");
>  
> -#define PCI_CLASS_SERIAL_IPMI		0x0c07
> -#define PCI_CLASS_SERIAL_IPMI_SMIC	0x0c0700
> -#define PCI_CLASS_SERIAL_IPMI_KCS	0x0c0701
> -#define PCI_CLASS_SERIAL_IPMI_BT	0x0c0702
> -
>  #define PCI_DEVICE_ID_HP_MMC 0x121A
>  
>  static void ipmi_pci_cleanup(struct si_sm_io *io)
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index cc608fc5..ac79652 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -117,6 +117,10 @@
>  #define PCI_CLASS_SERIAL_USB_DEVICE	0x0c03fe
>  #define PCI_CLASS_SERIAL_FIBER		0x0c04
>  #define PCI_CLASS_SERIAL_SMBUS		0x0c05
> +#define PCI_CLASS_SERIAL_IPMI		0x0c07
> +#define PCI_CLASS_SERIAL_IPMI_SMIC	0x0c0700
> +#define PCI_CLASS_SERIAL_IPMI_KCS	0x0c0701
> +#define PCI_CLASS_SERIAL_IPMI_BT	0x0c0702
>  
>  #define PCI_BASE_CLASS_WIRELESS			0x0d
>  #define PCI_CLASS_WIRELESS_RF_CONTROLLER	0x0d10
> -- 
> 2.7.4
>