Commit 3eb5d0f2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Drop bogus kernel-doc marker in pci_endpoint_test.c (Randy Dunlap)

- Fix epf_ntb_mw_bar_clear() kernel-doc (Yang Yingliang)

- Constify struct kobj_type pci_slot_ktype (Thomas Weißschuh)

* pci/misc:
  PCI: hv: Drop duplicate PCI_MSI dependency
  PCI/sysfs: Constify struct kobj_type pci_slot_ktype
  PCI: endpoint: pci-epf-vntb: Add epf_ntb_mw_bar_clear() num_mws kernel-doc
  misc: pci_endpoint_test: Drop initial kernel-doc marker
parents 90fb1a36 9574d57f

drivers/misc/pci_endpoint_test.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/**

/*

 * Host side test driver to test endpoint functionality

 *

 * Copyright (C) 2017 Texas Instruments

drivers/pci/controller/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ config PCIE_BRCMSTB 


config PCI_HYPERV_INTERFACE

	tristate "Hyper-V PCI Interface"

	depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI && PCI_MSI

	depends on ((X86 && X86_64) || ARM64) && HYPERV && PCI_MSI

	help

	  The Hyper-V PCI Interface is a helper driver allows other drivers to

	  have a common interface with the Hyper-V PCI frontend driver.

drivers/pci/endpoint/functions/pci-epf-vntb.c

+1 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ static int epf_ntb_mw_bar_init(struct epf_ntb *ntb) 
/**

 * epf_ntb_mw_bar_clear() - Clear Memory window BARs

 * @ntb: NTB device that facilitates communication between HOST and VHOST

 * @num_mws: the number of Memory window BARs that to be cleared

 */

static void epf_ntb_mw_bar_clear(struct epf_ntb *ntb, int num_mws)

{

drivers/pci/slot.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct attribute *pci_slot_default_attrs[] = { 
};

ATTRIBUTE_GROUPS(pci_slot_default);



static struct kobj_type pci_slot_ktype = {

static const struct kobj_type pci_slot_ktype = {

	.sysfs_ops = &pci_slot_sysfs_ops,

	.release = &pci_slot_release,

	.default_groups = pci_slot_default_groups,