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

Commit 46ff3463 authored by Brice Goglin's avatar Brice Goglin Committed by Greg Kroah-Hartman
Browse files

MSI: Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT 



0x08 is the HT capability, while PCI_CAP_ID_HT_IRQCONF would be
the subtype 0x80 that mpic_scan_ht_pic() uses.
Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT.

And by the way, use it in the ipath driver instead of defining its
own HT_CAPABILITY_ID.

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fe97064c

arch/powerpc/sysdev/mpic.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static void __init mpic_scan_ht_pic(struct mpic *mpic, u8 __iomem *devbase, 
	for (pos = readb(devbase + PCI_CAPABILITY_LIST); pos != 0;

	     pos = readb(devbase + pos + PCI_CAP_LIST_NEXT)) {

		u8 id = readb(devbase + pos + PCI_CAP_LIST_ID);

		if (id == PCI_CAP_ID_HT_IRQCONF) {

		if (id == PCI_CAP_ID_HT) {

			id = readb(devbase + pos + 3);

			if (id == 0x80)

				break;

drivers/infiniband/hw/ipath/ipath_iba6110.c

+2 −3
Original line number Diff line number Diff line
@@ -742,7 +742,6 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd) 
	return 0;

}



#define HT_CAPABILITY_ID   0x08	/* HT capabilities not defined in kernel */

#define HT_INTR_DISC_CONFIG  0x80	/* HT interrupt and discovery cap */

#define HT_INTR_REG_INDEX    2	/* intconfig requires indirect accesses */
@@ -973,7 +972,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd, 
	 * do this early, before we ever enable errors or hardware errors,

	 * mostly to avoid causing the chip to enter freeze mode.

	 */

	pos = pci_find_capability(pdev, HT_CAPABILITY_ID);

	pos = pci_find_capability(pdev, PCI_CAP_ID_HT);

	if (!pos) {

		ipath_dev_err(dd, "Couldn't find HyperTransport "

			      "capability; no interrupts\n");
@@ -996,7 +995,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd, 
		else if (cap_type == HT_INTR_DISC_CONFIG)

			ihandler = set_int_handler(dd, pdev, pos);

	} while ((pos = pci_find_next_capability(pdev, pos,

						 HT_CAPABILITY_ID)));

						 PCI_CAP_ID_HT)));



	if (!ihandler) {

		ipath_dev_err(dd, "Couldn't find interrupt handler in "

include/linux/pci_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
#define  PCI_CAP_ID_MSI		0x05	/* Message Signalled Interrupts */

#define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */

#define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */

#define  PCI_CAP_ID_HT_IRQCONF	0x08	/* HyperTransport IRQ Configuration */

#define  PCI_CAP_ID_HT		0x08	/* HyperTransport */

#define  PCI_CAP_ID_VNDR	0x09	/* Vendor specific capability */

#define  PCI_CAP_ID_SHPC 	0x0C	/* PCI Standard Hot-Plug Controller */

#define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */