diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-03 04:06:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-03 04:06:04 +0300 |
| commit | 90a300dc0553c5c4a3324ca6de5877c834d27af7 (patch) | |
| tree | b72710b5d2a2dfe67a33f4fde4b6e7bbea503584 /drivers/nvdimm/badrange.c | |
| parent | e5760335882bd91137873b8f2230b6c1f91da52b (diff) | |
| parent | 9ea459e477dc09370cdd8ee13b61aefe8cd1f20a (diff) | |
| download | linux-90a300dc0553c5c4a3324ca6de5877c834d27af7.tar.xz | |
Merge tag 'libnvdimm-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Ira Weiny:
- updates to deprecated and changed interfaces
- bug/kdoc fixes
* tag 'libnvdimm-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
libnvdimm: remove kernel-doc warnings:
testing: nvdimm: make struct class structures constant
libnvdimm: Annotate struct nd_region with __counted_by
nd_btt: Make BTT lanes preemptible
libnvdimm/of_pmem: Use devm_kstrdup instead of kstrdup and check its return value
dax: refactor deprecated strncpy
Diffstat (limited to 'drivers/nvdimm/badrange.c')
| -rw-r--r-- | drivers/nvdimm/badrange.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvdimm/badrange.c b/drivers/nvdimm/badrange.c index aaf6e215a8c6..a002ea6fdd84 100644 --- a/drivers/nvdimm/badrange.c +++ b/drivers/nvdimm/badrange.c @@ -257,9 +257,9 @@ static void badblocks_populate(struct badrange *badrange, /** * nvdimm_badblocks_populate() - Convert a list of badranges to badblocks - * @region: parent region of the range to interrogate + * @nd_region: parent region of the range to interrogate * @bb: badblocks instance to populate - * @res: resource range to consider + * @range: resource range to consider * * The badrange list generated during bus initialization may contain * multiple, possibly overlapping physical address ranges. Compare each |