Skip to content

Commit 347269c

Browse files
kwilczynskibjorn-helgaas
authored andcommitted
PCI: Fix kernel-doc formatting
Fix kernel-doc formatting throughout drivers/pci and related include files. No change to functionality intended. Check for warnings: $ find include drivers/pci -type f -path "*pci*.[ch]" | xargs scripts/kernel-doc -none [bhelgaas: squashed to one commit] Link: https://lore.kernel.org/r/20210509030237.368540-1-kw@linux.com Link: https://lore.kernel.org/r/20210703151306.1922450-1-kw@linux.com Link: https://lore.kernel.org/r/20210703151306.1922450-2-kw@linux.com Link: https://lore.kernel.org/r/20210703151306.1922450-3-kw@linux.com Link: https://lore.kernel.org/r/20210703151306.1922450-4-kw@linux.com Link: https://lore.kernel.org/r/20210703151306.1922450-5-kw@linux.com Signed-off-by: Krzysztof Wilczyński <kw@linux.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
1 parent 6efb943 commit 347269c

14 files changed

Lines changed: 52 additions & 33 deletions

File tree

drivers/pci/controller/cadence/pcie-cadence.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,12 @@ struct cdns_pcie_ops {
263263
* struct cdns_pcie - private data for Cadence PCIe controller drivers
264264
* @reg_base: IO mapped register base
265265
* @mem_res: start/end offsets in the physical system memory to map PCI accesses
266+
* @dev: PCIe controller
266267
* @is_rc: tell whether the PCIe controller mode is Root Complex or Endpoint.
267-
* @bus: In Root Complex mode, the bus number
268-
* @ops: Platform specific ops to control various inputs from Cadence PCIe
268+
* @phy_count: number of supported PHY devices
269+
* @phy: list of pointers to specific PHY control blocks
270+
* @link: list of pointers to corresponding device link representations
271+
* @ops: Platform-specific ops to control various inputs from Cadence PCIe
269272
* wrapper
270273
*/
271274
struct cdns_pcie {

drivers/pci/controller/pci-xgene.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0+
2-
/**
2+
/*
33
* APM X-Gene PCIe Driver
44
*
55
* Copyright (c) 2014 Applied Micro Circuits Corporation.

drivers/pci/controller/pcie-iproc-msi.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ enum iproc_msi_reg {
4949
struct iproc_msi;
5050

5151
/**
52-
* iProc MSI group
52+
* struct iproc_msi_grp - iProc MSI group
5353
*
5454
* One MSI group is allocated per GIC interrupt, serviced by one iProc MSI
5555
* event queue.
@@ -65,7 +65,7 @@ struct iproc_msi_grp {
6565
};
6666

6767
/**
68-
* iProc event queue based MSI
68+
* struct iproc_msi - iProc event queue based MSI
6969
*
7070
* Only meant to be used on platforms without MSI support integrated into the
7171
* GIC.

drivers/pci/controller/pcie-iproc.c

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@
8989
#define IPROC_PCIE_REG_INVALID 0xffff
9090

9191
/**
92-
* iProc PCIe outbound mapping controller specific parameters
93-
*
92+
* struct iproc_pcie_ob_map - iProc PCIe outbound mapping controller-specific
93+
* parameters
9494
* @window_sizes: list of supported outbound mapping window sizes in MB
9595
* @nr_sizes: number of supported outbound mapping window sizes
9696
*/
@@ -136,22 +136,20 @@ static const struct iproc_pcie_ob_map paxb_v2_ob_map[] = {
136136
};
137137

138138
/**
139-
* iProc PCIe inbound mapping type
139+
* enum iproc_pcie_ib_map_type - iProc PCIe inbound mapping type
140+
* @IPROC_PCIE_IB_MAP_MEM: DDR memory
141+
* @IPROC_PCIE_IB_MAP_IO: device I/O memory
142+
* @IPROC_PCIE_IB_MAP_INVALID: invalid or unused
140143
*/
141144
enum iproc_pcie_ib_map_type {
142-
/* for DDR memory */
143145
IPROC_PCIE_IB_MAP_MEM = 0,
144-
145-
/* for device I/O memory */
146146
IPROC_PCIE_IB_MAP_IO,
147-
148-
/* invalid or unused */
149147
IPROC_PCIE_IB_MAP_INVALID
150148
};
151149

152150
/**
153-
* iProc PCIe inbound mapping controller specific parameters
154-
*
151+
* struct iproc_pcie_ib_map - iProc PCIe inbound mapping controller-specific
152+
* parameters
155153
* @type: inbound mapping region type
156154
* @size_unit: inbound mapping region size unit, could be SZ_1K, SZ_1M, or
157155
* SZ_1G
@@ -437,7 +435,7 @@ static inline void iproc_pcie_write_reg(struct iproc_pcie *pcie,
437435
writel(val, pcie->base + offset);
438436
}
439437

440-
/**
438+
/*
441439
* APB error forwarding can be disabled during access of configuration
442440
* registers of the endpoint device, to prevent unsupported requests
443441
* (typically seen during enumeration with multi-function devices) from
@@ -619,7 +617,7 @@ static int iproc_pcie_config_read(struct pci_bus *bus, unsigned int devfn,
619617
return PCIBIOS_SUCCESSFUL;
620618
}
621619

622-
/**
620+
/*
623621
* Note access to the configuration registers are protected at the higher layer
624622
* by 'pci_lock' in drivers/pci/access.c
625623
*/
@@ -897,7 +895,7 @@ static inline int iproc_pcie_ob_write(struct iproc_pcie *pcie, int window_idx,
897895
return 0;
898896
}
899897

900-
/**
898+
/*
901899
* Some iProc SoCs require the SW to configure the outbound address mapping
902900
*
903901
* Outbound address translation:

drivers/pci/controller/pcie-iproc.h

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
#define _PCIE_IPROC_H
88

99
/**
10-
* iProc PCIe interface type
10+
* enum iproc_pcie_type - iProc PCIe interface type
11+
* @IPROC_PCIE_PAXB_BCMA: BCMA-based host controllers
12+
* @IPROC_PCIE_PAXB: PAXB-based host controllers for
13+
* NS, NSP, Cygnus, NS2, and Pegasus SOCs
14+
* @IPROC_PCIE_PAXB_V2: PAXB-based host controllers for Stingray SoCs
15+
* @IPROC_PCIE_PAXC: PAXC-based host controllers
16+
* @IPROC_PCIE_PAXC_V2: PAXC-based host controllers (second generation)
1117
*
1218
* PAXB is the wrapper used in root complex that can be connected to an
1319
* external endpoint device.
@@ -24,7 +30,7 @@ enum iproc_pcie_type {
2430
};
2531

2632
/**
27-
* iProc PCIe outbound mapping
33+
* struct iproc_pcie_ob - iProc PCIe outbound mapping
2834
* @axi_offset: offset from the AXI address to the internal address used by
2935
* the iProc PCIe core
3036
* @nr_windows: total number of supported outbound mapping windows
@@ -35,7 +41,7 @@ struct iproc_pcie_ob {
3541
};
3642

3743
/**
38-
* iProc PCIe inbound mapping
44+
* struct iproc_pcie_ib - iProc PCIe inbound mapping
3945
* @nr_regions: total number of supported inbound mapping regions
4046
*/
4147
struct iproc_pcie_ib {
@@ -47,13 +53,13 @@ struct iproc_pcie_ib_map;
4753
struct iproc_msi;
4854

4955
/**
50-
* iProc PCIe device
51-
*
56+
* struct iproc_pcie - iProc PCIe device
5257
* @dev: pointer to device data structure
5358
* @type: iProc PCIe interface type
5459
* @reg_offsets: register offsets
5560
* @base: PCIe host controller I/O register base
5661
* @base_addr: PCIe host controller register base physical address
62+
* @mem: host bridge memory window resource
5763
* @phy: optional PHY device that controls the Serdes
5864
* @map_irq: function callback to map interrupts
5965
* @ep_is_internal: indicates an internal emulated endpoint device is connected

drivers/pci/hotplug/cpqphp_core.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,10 @@ static int ctrl_slot_cleanup(struct controller *ctrl)
296296
*
297297
* Won't work for more than one PCI-PCI bridge in a slot.
298298
*
299-
* @bus_num - bus number of PCI device
300-
* @dev_num - device number of PCI device
301-
* @slot - Pointer to u8 where slot number will be returned
299+
* @bus: pointer to the PCI bus structure
300+
* @bus_num: bus number of PCI device
301+
* @dev_num: device number of PCI device
302+
* @slot: Pointer to u8 where slot number will be returned
302303
*
303304
* Output: SUCCESS or FAILURE
304305
*/

drivers/pci/hotplug/cpqphp_ctrl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1877,7 +1877,7 @@ static void interrupt_event_handler(struct controller *ctrl)
18771877

18781878
/**
18791879
* cpqhp_pushbutton_thread - handle pushbutton events
1880-
* @slot: target slot (struct)
1880+
* @t: pointer to struct timer_list which holds all timer-related callbacks
18811881
*
18821882
* Scheduled procedure to handle blocking stuff for the pushbuttons.
18831883
* Handles all pending events and exits.

drivers/pci/hotplug/pciehp.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ extern int pciehp_poll_time;
4747
* struct controller - PCIe hotplug controller
4848
* @pcie: pointer to the controller's PCIe port service device
4949
* @slot_cap: cached copy of the Slot Capabilities register
50+
* @inband_presence_disabled: In-Band Presence Detect Disable supported by
51+
* controller and disabled per spec recommendation (PCIe r5.0, appendix I
52+
* implementation note)
5053
* @slot_ctrl: cached copy of the Slot Control register
5154
* @ctrl_lock: serializes writes to the Slot Control register
5255
* @cmd_started: jiffies when the Slot Control register was last written;

drivers/pci/pci.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ struct pci_sriov {
324324
/**
325325
* pci_dev_set_io_state - Set the new error state if possible.
326326
*
327-
* @dev - pci device to set new error_state
328-
* @new - the state we want dev to be in
327+
* @dev: PCI device to set new error_state
328+
* @new: the state we want dev to be in
329329
*
330330
* Must be called with device_lock held.
331331
*

include/linux/pci-ep-cfs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
2-
/**
2+
/*
33
* PCI Endpoint ConfigFS header file
44
*
55
* Copyright (C) 2017 Texas Instruments

0 commit comments

Comments
 (0)