Skip to content

Commit fa0dd2f

Browse files
committed
tree.h: fixup kernel-doc comments
To keep sphinx happy. Signed-off-by: Hannes Reinecke <[email protected]>
1 parent 7247b35 commit fa0dd2f

1 file changed

Lines changed: 46 additions & 42 deletions

File tree

src/nvme/tree.h

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -21,39 +21,13 @@
2121
#include "ioctl.h"
2222
#include "util.h"
2323

24-
/**
25-
*
26-
*/
2724
typedef struct nvme_ns *nvme_ns_t;
28-
29-
/**
30-
*
31-
*/
3225
typedef struct nvme_path *nvme_path_t;
33-
34-
/**
35-
*
36-
*/
3726
typedef struct nvme_ctrl *nvme_ctrl_t;
38-
39-
/**
40-
*
41-
*/
4227
typedef struct nvme_subsystem *nvme_subsystem_t;
43-
44-
/**
45-
*
46-
*/
4728
typedef struct nvme_host *nvme_host_t;
48-
49-
/**
50-
*
51-
*/
5229
typedef struct nvme_root *nvme_root_t;
5330

54-
/**
55-
*
56-
*/
5731
typedef bool (*nvme_scan_filter_t)(nvme_subsystem_t);
5832

5933
/**
@@ -145,7 +119,7 @@ void nvme_host_set_dhchap_key(nvme_host_t h, const char *key);
145119

146120
/**
147121
* nvme_default_host() - Initializes the default host
148-
* @root: nvme_root_t object
122+
* @r: nvme_root_t object
149123
*
150124
* Initializes the default host object based on the values in
151125
* /etc/nvme/hostnqn and /etc/nvme/hostid and attaches it to @r.
@@ -313,7 +287,10 @@ nvme_ns_t nvme_subsystem_first_ns(nvme_subsystem_t s);
313287
nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
314288

315289
/**
316-
* nvme_for_each_host_safe()
290+
* nvme_for_each_host_safe() - Traverse host list
291+
* @r: nvme_root_t object
292+
* @h: nvme_host_t object
293+
* @_h: temporary nvme_host_t object
317294
*/
318295
#define nvme_for_each_host_safe(r, h, _h) \
319296
for (h = nvme_first_host(r), \
@@ -322,14 +299,19 @@ nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
322299
h = _h, _h = nvme_next_host(r, h))
323300

324301
/**
325-
* nvme_for_each_host()
302+
* nvme_for_each_host() - Traverse host list
303+
* @r: nvme_root_t object
304+
* @h: nvme_host_t object
326305
*/
327306
#define nvme_for_each_host(r, h) \
328307
for (h = nvme_first_host(r); h != NULL; \
329308
h = nvme_next_host(r, h))
330309

331310
/**
332-
* nvme_for_each_subsystem_safe()
311+
* nvme_for_each_subsystem_safe() - Traverse subsystems
312+
* @h: nvme_host_t object
313+
* @s: nvme_subsystem_t object
314+
* @_s: temporary nvme_subsystem_t object
333315
*/
334316
#define nvme_for_each_subsystem_safe(h, s, _s) \
335317
for (s = nvme_first_subsystem(h), \
@@ -338,14 +320,19 @@ nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
338320
s = _s, _s = nvme_next_subsystem(h, s))
339321

340322
/**
341-
* nvme_for_each_subsystem()
323+
* nvme_for_each_subsystem() - Traverse subsystems
324+
* @h: nvme_host_t object
325+
* @s: nvme_subsystem_t object
342326
*/
343327
#define nvme_for_each_subsystem(h, s) \
344328
for (s = nvme_first_subsystem(h); s != NULL; \
345329
s = nvme_next_subsystem(h, s))
346330

347331
/**
348-
* nvme_subsystem_for_each_ctrl_safe()
332+
* nvme_subsystem_for_each_ctrl_safe() - Traverse controllers
333+
* @s: nvme_subsystem_t object
334+
* @c: nvme_ctrl_t object
335+
* @_c: temporary nvme_ctrl_t object
349336
*/
350337
#define nvme_subsystem_for_each_ctrl_safe(s, c, _c) \
351338
for (c = nvme_subsystem_first_ctrl(s), \
@@ -354,14 +341,19 @@ nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
354341
c = _c, _c = nvme_subsystem_next_ctrl(s, c))
355342

356343
/**
357-
* nvme_subsystem_for_each_ctrl()
344+
* nvme_subsystem_for_each_ctrl() - traverse controllers
345+
* @s: nvme_subsystem_t object
346+
* @c: nvme_ctrl_t object
358347
*/
359348
#define nvme_subsystem_for_each_ctrl(s, c) \
360349
for (c = nvme_subsystem_first_ctrl(s); c != NULL; \
361350
c = nvme_subsystem_next_ctrl(s, c))
362351

363352
/**
364-
* nvme_ctrl_for_each_ns_safe()
353+
* nvme_ctrl_for_each_ns_safe() - traverse namespaces
354+
* @c: nvme_ctrl_t object
355+
* @n: nvme_ns_t object
356+
* @_n: temporary nvme_ns_t object
365357
*/
366358
#define nvme_ctrl_for_each_ns_safe(c, n, _n) \
367359
for (n = nvme_ctrl_first_ns(c), \
@@ -370,14 +362,19 @@ nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
370362
n = _n, _n = nvme_ctrl_next_ns(c, n))
371363

372364
/**
373-
* nvme_ctrl_for_each_ns()
365+
* nvme_ctrl_for_each_ns() - traverse namespaces
366+
* @c: nvme_ctrl_t object
367+
* @n: nvme_ns_t object
374368
*/
375369
#define nvme_ctrl_for_each_ns(c, n) \
376370
for (n = nvme_ctrl_first_ns(c); n != NULL; \
377371
n = nvme_ctrl_next_ns(c, n))
378372

379373
/**
380-
* nvme_ctrl_for_each_path_safe()
374+
* nvme_ctrl_for_each_path_safe() - Traverse paths
375+
* @c: nvme_ctrl_t object
376+
* @p: nvme_path_t object
377+
* @_p: temporary nvme_path_t object
381378
*/
382379
#define nvme_ctrl_for_each_path_safe(c, p, _p) \
383380
for (p = nvme_ctrl_first_path(c), \
@@ -386,14 +383,19 @@ nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
386383
p = _p, _p = nvme_ctrl_next_path(c, p))
387384

388385
/**
389-
* nvme_ctrl_for_each_path()
386+
* nvme_ctrl_for_each_path() - Traverse paths
387+
* @c: nvme_ctrl_t object
388+
* @p: nvme_path_t object
390389
*/
391390
#define nvme_ctrl_for_each_path(c, p) \
392391
for (p = nvme_ctrl_first_path(c); p != NULL; \
393392
p = nvme_ctrl_next_path(c, p))
394393

395394
/**
396-
* nvme_subsystem_for_each_ns_safe()
395+
* nvme_subsystem_for_each_ns_safe() - Traverse namespaces
396+
* @s: nvme_subsystem_t object
397+
* @n: nvme_ns_t object
398+
* @_n: temporary nvme_ns_t object
397399
*/
398400
#define nvme_subsystem_for_each_ns_safe(s, n, _n) \
399401
for (n = nvme_subsystem_first_ns(s), \
@@ -402,7 +404,9 @@ nvme_ns_t nvme_subsystem_next_ns(nvme_subsystem_t s, nvme_ns_t n);
402404
n = _n, _n = nvme_subsystem_next_ns(s, n))
403405

404406
/**
405-
* nvme_subsystem_for_each_ns()
407+
* nvme_subsystem_for_each_ns() - Traverse namespaces
408+
* @s: nvme_subsystem_t object
409+
* @n: nvme_ns_t object
406410
*/
407411
#define nvme_subsystem_for_each_ns(s, n) \
408412
for (n = nvme_subsystem_first_ns(s); n != NULL; \
@@ -561,7 +565,7 @@ nvme_ctrl_t nvme_ns_get_ctrl(nvme_ns_t n);
561565

562566
/**
563567
* nvme_free_ns() - free an nvme_ns_t object
564-
* @ns: nvme_ns_t object
568+
* @n: nvme_ns_t object
565569
*/
566570
void nvme_free_ns(struct nvme_ns *n);
567571

@@ -1101,12 +1105,12 @@ int nvme_dump_config(nvme_root_t r);
11011105

11021106
/**
11031107
* nvme_get_attr() - Read sysfs attribute
1104-
* @dir: sysfs directory
1108+
* @d: sysfs directory
11051109
* @attr: sysfs attribute name
11061110
*
11071111
* Return: string with the contents of @attr
11081112
*/
1109-
char *nvme_get_attr(const char *dir, const char *attr);
1113+
char *nvme_get_attr(const char *d, const char *attr);
11101114

11111115
/**
11121116
* nvme_get_subsys_attr() - Read subsystem sysfs attribute

0 commit comments

Comments
 (0)