Skip to content

Commit 7119ca3

Browse files
committed
Merge branch 'pci/misc'
- Drop unused struct pci_driver.node member (Mathias Krause) - Fix documentation typos (Attreyee Mukherjee) - Use a unique test pattern for each BAR in the pci_endpoint_test to make it easier to debug address translation issues (Niklas Cassel) - Fix kernel-doc issues (Bjorn Helgaas) * pci/misc: PCI: Fix kernel-doc issues misc: pci_endpoint_test: Use a unique test pattern for each BAR docs: PCI: Fix typos PCI: Remove unused 'node' member from struct pci_driver
2 parents 9946bbb + 2db6b72 commit 7119ca3

File tree

7 files changed

+17
-9
lines changed

7 files changed

+17
-9
lines changed

Documentation/PCI/boot-interrupts.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Conditions
6161
==========
6262

6363
The use of threaded interrupts is the most likely condition to trigger
64-
this problem today. Threaded interrupts may not be reenabled after the IRQ
64+
this problem today. Threaded interrupts may not be re-enabled after the IRQ
6565
handler wakes. These "one shot" conditions mean that the threaded interrupt
6666
needs to keep the interrupt line masked until the threaded handler has run.
6767
Especially when dealing with high data rate interrupts, the thread needs to

Documentation/PCI/msi-howto.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ including a full 'lspci -v' so we can add the quirks to the kernel.
236236
Disabling MSIs below a bridge
237237
-----------------------------
238238

239-
Some PCI bridges are not able to route MSIs between busses properly.
239+
Some PCI bridges are not able to route MSIs between buses properly.
240240
In this case, MSIs must be disabled on all devices behind the bridge.
241241

242242
Some bridges allow you to enable MSIs by changing some bits in their

drivers/misc/pci_endpoint_test.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,15 @@ static bool pci_endpoint_test_request_irq(struct pci_endpoint_test *test)
263263
return false;
264264
}
265265

266+
static const u32 bar_test_pattern[] = {
267+
0xA0A0A0A0,
268+
0xA1A1A1A1,
269+
0xA2A2A2A2,
270+
0xA3A3A3A3,
271+
0xA4A4A4A4,
272+
0xA5A5A5A5,
273+
};
274+
266275
static bool pci_endpoint_test_bar(struct pci_endpoint_test *test,
267276
enum pci_barno barno)
268277
{
@@ -280,11 +289,12 @@ static bool pci_endpoint_test_bar(struct pci_endpoint_test *test,
280289
size = 0x4;
281290

282291
for (j = 0; j < size; j += 4)
283-
pci_endpoint_test_bar_writel(test, barno, j, 0xA0A0A0A0);
292+
pci_endpoint_test_bar_writel(test, barno, j,
293+
bar_test_pattern[barno]);
284294

285295
for (j = 0; j < size; j += 4) {
286296
val = pci_endpoint_test_bar_readl(test, barno, j);
287-
if (val != 0xA0A0A0A0)
297+
if (val != bar_test_pattern[barno])
288298
return false;
289299
}
290300

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2707,7 +2707,6 @@ MODULE_DEVICE_TABLE(pci, brcmf_pcie_devid_table);
27072707

27082708

27092709
static struct pci_driver brcmf_pciedrvr = {
2710-
.node = {},
27112710
.name = KBUILD_MODNAME,
27122711
.id_table = brcmf_pcie_devid_table,
27132712
.probe = brcmf_pcie_probe,

include/linux/pci-epc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct pci_epc_mem {
115115
* struct pci_epc - represents the PCI EPC device
116116
* @dev: PCI EPC device
117117
* @pci_epf: list of endpoint functions present in this EPC device
118-
* list_lock: Mutex for protecting pci_epf list
118+
* @list_lock: Mutex for protecting pci_epf list
119119
* @ops: function pointers for performing endpoint operations
120120
* @windows: array of address space of the endpoint controller
121121
* @mem: first window of the endpoint controller, which corresponds to

include/linux/pci-epf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct pci_epf_ops {
6868
};
6969

7070
/**
71-
* struct pci_epf_event_ops - Callbacks for capturing the EPC events
71+
* struct pci_epc_event_ops - Callbacks for capturing the EPC events
7272
* @core_init: Callback for the EPC initialization complete event
7373
* @link_up: Callback for the EPC link up event
7474
* @link_down: Callback for the EPC link down event

include/linux/pci.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ static inline bool pci_is_bridge(struct pci_dev *dev)
715715

716716
/**
717717
* pci_is_vga - check if the PCI device is a VGA device
718+
* @pdev: PCI device
718719
*
719720
* The PCI Code and ID Assignment spec, r1.15, secs 1.4 and 1.1, define
720721
* VGA Base Class and Sub-Classes:
@@ -885,7 +886,6 @@ struct module;
885886

886887
/**
887888
* struct pci_driver - PCI driver structure
888-
* @node: List of driver structures.
889889
* @name: Driver name.
890890
* @id_table: Pointer to table of device IDs the driver is
891891
* interested in. Most drivers should export this
@@ -940,7 +940,6 @@ struct module;
940940
* own I/O address space.
941941
*/
942942
struct pci_driver {
943-
struct list_head node;
944943
const char *name;
945944
const struct pci_device_id *id_table; /* Must be non-NULL for probe to be called */
946945
int (*probe)(struct pci_dev *dev, const struct pci_device_id *id); /* New device inserted */

0 commit comments

Comments
 (0)