diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-16 00:28:56 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-16 00:28:56 +0300 |
| commit | c405aa3ea36c1f973a9f10bbcfabc9aeeb38040c (patch) | |
| tree | ebd2e373db29a3836cc5ca4e53c984fa66246955 /drivers/dax | |
| parent | a49468240e89628236b738b5ab9416eae8f90c15 (diff) | |
| parent | 41147b006be2174b825a54b0620ecf4cc7ec5c84 (diff) | |
| download | linux-c405aa3ea36c1f973a9f10bbcfabc9aeeb38040c.tar.xz | |
Merge tag 'libnvdimm-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull nvdimm updates from Ira Weiny:
"The changes include removing duplicate code and updating the nvdimm
tree to the current kernel interfaces such as using const for struct
device_type and changing the platform remove callback signature"
* tag 'libnvdimm-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
dax: remove redundant assignment to variable rc
ndtest: Convert to platform remove callback returning void
nvdimm/btt: always set max_integrity_segments
nvdimm: remove nd_integrity_init
dax: constify the struct device_type usage
powerpc/papr_scm: Move duplicate definitions to common header files
Diffstat (limited to 'drivers/dax')
| -rw-r--r-- | drivers/dax/bus.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 797e1ebff299..6ec5db8013e8 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -818,7 +818,7 @@ static const struct attribute_group *dax_mapping_attribute_groups[] = { NULL, }; -static struct device_type dax_mapping_type = { +static const struct device_type dax_mapping_type = { .release = dax_mapping_release, .groups = dax_mapping_attribute_groups, }; @@ -1204,7 +1204,6 @@ static ssize_t mapping_store(struct device *dev, struct device_attribute *attr, if (rc) return rc; - rc = -ENXIO; rc = down_write_killable(&dax_region_rwsem); if (rc) return rc; |