Commit 78b5a310 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

PCI: Drop msi_mask_reg() and remove drivers/pci/msi.h 



msi_mask_reg() doesn't provide any useful abstraction, do drop it.

Remove the now-empty drivers/pci/msi.h.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 527eee29

drivers/pci/msi.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/slab.h>



#include "pci.h"

#include "msi.h"



static int pci_msi_enable = 1;
@@ -564,7 +563,8 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) 
	entry->msi_attrib.default_irq	= dev->irq;	/* Save IOAPIC IRQ */

	entry->msi_attrib.pos		= dev->msi_cap;



	entry->mask_pos = msi_mask_reg(dev->msi_cap, entry->msi_attrib.is_64);

	entry->mask_pos = dev->msi_cap + (control & PCI_MSI_FLAGS_64BIT) ?

		PCI_MSI_MASK_64 : PCI_MSI_MASK_32;

	/* All MSIs are unmasked by default, Mask them all */

	if (entry->msi_attrib.maskbit)

		pci_read_config_dword(dev, entry->mask_pos, &entry->masked);

drivers/pci/msi.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2003-2004 Intel

 * Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)

 */



#ifndef MSI_H

#define MSI_H



#define msi_mask_reg(base, is64bit)	\

	(base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32))



#endif /* MSI_H */