Commit 9a212aaf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull pci fix from Bjorn Helgaas:

 - Fix Hyper-V "defined but not used" build issue added during merge
   window (YueHaibing)

* tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: hv: Remove unused hv_set_msi_entry_from_desc()
parents 02d4f8a3 22ef7ee3

drivers/pci/controller/pci-hyperv.c

+0 −8
Original line number Diff line number Diff line
@@ -766,14 +766,6 @@ static unsigned int hv_msi_get_int_vector(struct irq_data *irqd) 
	return irqd->parent_data->hwirq;

}



static void hv_set_msi_entry_from_desc(union hv_msi_entry *msi_entry,

				       struct msi_desc *msi_desc)

{

	msi_entry->address = ((u64)msi_desc->msg.address_hi << 32) |

			      msi_desc->msg.address_lo;

	msi_entry->data = msi_desc->msg.data;

}



/*

 * @nr_bm_irqs:		Indicates the number of IRQs that were allocated from

 *			the bitmap.