Skip to content

Commit 19a957f

Browse files
authored
Merge pull request #245 from Arunpandian15/cleanup_17
Cleanup patch for linux.h, log.h, tree.h
2 parents 084518b + f493892 commit 19a957f

3 files changed

Lines changed: 350 additions & 351 deletions

File tree

src/nvme/linux.h

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright (c) 2020 Western Digital Corporation or its affiliates.
55
*
66
* Authors: Keith Busch <[email protected]>
7-
* Chaitanya Kulkarni <[email protected]>
7+
* Chaitanya Kulkarni <[email protected]>
88
*/
99
#ifndef _LIBNVME_LINUX_H
1010
#define _LIBNVME_LINUX_H
@@ -21,12 +21,12 @@
2121
*/
2222

2323
/**
24-
* nvme_fw_download_seq() - firmware download sequence
25-
* @fd: File descriptor of nvme device
26-
* @size: Total size of the firmware image to transfer
27-
* @xfer: Maximum size to send with each partial transfer
28-
* @offset: Starting offset to send with this firmware downlaod
29-
* @buf: Address of buffer containing all or part of the firmware image.
24+
* nvme_fw_download_seq() - Firmware download sequence
25+
* @fd: File descriptor of nvme device
26+
* @size: Total size of the firmware image to transfer
27+
* @xfer: Maximum size to send with each partial transfer
28+
* @offset: Starting offset to send with this firmware downlaod
29+
* @buf: Address of buffer containing all or part of the firmware image.
3030
*
3131
* Return: The nvme command status if a response was received (see
3232
* &enum nvme_status_field) or -1 with errno set otherwise.
@@ -49,12 +49,12 @@ enum nvme_telemetry_da {
4949
};
5050

5151
/**
52-
* nvme_get_ctrl_telemetry() - get controller telemetry log
53-
* @fd: File descriptor of nvme device
54-
* @rae: Retain asynchronous events
55-
* @log: On success, set to the value of the allocated and retrieved log.
56-
* @da: log page data area, valid values: &enum nvme_telemetry_da
57-
* @size: Ptr to the telemetry log size, so it can be returned
52+
* nvme_get_ctrl_telemetry() - Get controller telemetry log
53+
* @fd: File descriptor of nvme device
54+
* @rae: Retain asynchronous events
55+
* @log: On success, set to the value of the allocated and retrieved log.
56+
* @da: Log page data area, valid values: &enum nvme_telemetry_da
57+
* @size: Ptr to the telemetry log size, so it can be returned
5858
*
5959
* The total size allocated can be calculated as:
6060
* (nvme_telemetry_log da size + 1) * NVME_LOG_TELEM_BLOCK_SIZE.
@@ -66,11 +66,11 @@ int nvme_get_ctrl_telemetry(int fd, bool rae, struct nvme_telemetry_log **log,
6666
enum nvme_telemetry_da da, size_t *size);
6767

6868
/**
69-
* nvme_get_host_telemetry() - get host telemetry log
70-
* @fd: File descriptor of nvme device
71-
* @log: On success, set to the value of the allocated and retrieved log.
72-
* @da: log page data area, valid values: &enum nvme_telemetry_da
73-
* @size: Ptr to the telemetry log size, so it can be returned
69+
* nvme_get_host_telemetry() - Get host telemetry log
70+
* @fd: File descriptor of nvme device
71+
* @log: On success, set to the value of the allocated and retrieved log.
72+
* @da: Log page data area, valid values: &enum nvme_telemetry_da
73+
* @size: Ptr to the telemetry log size, so it can be returned
7474
*
7575
* The total size allocated can be calculated as:
7676
* (nvme_telemetry_log da size + 1) * NVME_LOG_TELEM_BLOCK_SIZE.
@@ -82,11 +82,11 @@ int nvme_get_host_telemetry(int fd, struct nvme_telemetry_log **log,
8282
enum nvme_telemetry_da da, size_t *size);
8383

8484
/**
85-
* nvme_get_new_host_telemetry() - get new host telemetry log
86-
* @fd: File descriptor of nvme device
87-
* @log: On success, set to the value of the allocated and retrieved log.
88-
* @da: log page data area, valid values: &enum nvme_telemetry_da
89-
* @size: Ptr to the telemetry log size, so it can be returned
85+
* nvme_get_new_host_telemetry() - Get new host telemetry log
86+
* @fd: File descriptor of nvme device
87+
* @log: On success, set to the value of the allocated and retrieved log.
88+
* @da: Log page data area, valid values: &enum nvme_telemetry_da
89+
* @size: Ptr to the telemetry log size, so it can be returned
9090
*
9191
* The total size allocated can be calculated as:
9292
* (nvme_telemetry_log da size + 1) * NVME_LOG_TELEM_BLOCK_SIZE.
@@ -98,9 +98,9 @@ int nvme_get_new_host_telemetry(int fd, struct nvme_telemetry_log **log,
9898
enum nvme_telemetry_da da, size_t *size);
9999

100100
/**
101-
* nvme_get_log_page() - get log page data
102-
* @fd: File descriptor of nvme device
103-
* @xfer_len: Max log transfer size per request to split the total.
101+
* nvme_get_log_page() - Get log page data
102+
* @fd: File descriptor of nvme device
103+
* @xfer_len: Max log transfer size per request to split the total.
104104
* @args: &struct nvme_get_log_args argument structure
105105
*
106106
* Return: The nvme command status if a response was received (see
@@ -131,9 +131,9 @@ int nvme_get_logical_block_size(int fd, __u32 nsid, int *blksize);
131131

132132
/**
133133
* nvme_get_lba_status_log() - Retreive the LBA Status log page
134-
* @fd: File descriptor of the nvme device
135-
* @rae: Retain asynchronous events
136-
* @log: On success, set to the value of the allocated and retreived log.
134+
* @fd: File descriptor of the nvme device
135+
* @rae: Retain asynchronous events
136+
* @log: On success, set to the value of the allocated and retreived log.
137137
*
138138
* Return: The nvme command status if a response was received (see
139139
* &enum nvme_status_field) or -1 with errno set otherwise.
@@ -166,7 +166,7 @@ int nvme_namespace_detach_ctrls(int fd, __u32 nsid, __u16 num_ctrls, __u16 *ctrl
166166

167167
/**
168168
* nvme_open() - Open an nvme controller or namespace device
169-
* @name: The basename of the device to open
169+
* @name: The basename of the device to open
170170
*
171171
* This will look for the handle in /dev/ and validate the name and filetype
172172
* match linux conventions.

src/nvme/log.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
*/
2323

2424
/**
25-
* nvme_init_logging() - initialize logging
26-
* @r: nvme_root_t context
27-
* @lvl: logging level to set
28-
* @log_pid: boolean to enable logging of the PID
29-
* @log_tstamp: boolean to enable logging of the timestamp
25+
* nvme_init_logging() - Initialize logging
26+
* @r: nvme_root_t context
27+
* @lvl: Logging level to set
28+
* @log_pid: Boolean to enable logging of the PID
29+
* @log_tstamp: Boolean to enable logging of the timestamp
3030
*
3131
* Sets the default logging variables for the library.
3232
*/

0 commit comments

Comments
 (0)