Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 808c340b authored by Ross Zwisler's avatar Ross Zwisler Committed by Dan Williams
Browse files

dax: Use dax_write_cache* helpers 



Use dax_write_cache() and dax_write_cache_enabled() instead of open coding
the bit operations.

Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 546eb031

drivers/dax/super.c

+3 −6
Original line number Diff line number Diff line
@@ -182,8 +182,7 @@ static ssize_t write_cache_show(struct device *dev, 
	if (!dax_dev)

		return -ENXIO;



	rc = sprintf(buf, "%d\n", !!test_bit(DAXDEV_WRITE_CACHE,

				&dax_dev->flags));

	rc = sprintf(buf, "%d\n", !!dax_write_cache_enabled(dax_dev));

	put_dax(dax_dev);

	return rc;

}
@@ -201,10 +200,8 @@ static ssize_t write_cache_store(struct device *dev, 


	if (rc)

		len = rc;

	else if (write_cache)

		set_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags);

	else

		clear_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags);

		dax_write_cache(dax_dev, write_cache);



	put_dax(dax_dev);

	return len;
@@ -286,7 +283,7 @@ EXPORT_SYMBOL_GPL(dax_copy_from_iter); 
void arch_wb_cache_pmem(void *addr, size_t size);

void dax_flush(struct dax_device *dax_dev, void *addr, size_t size)

{

	if (unlikely(!test_bit(DAXDEV_WRITE_CACHE, &dax_dev->flags)))

	if (unlikely(!dax_write_cache_enabled(dax_dev)))

		return;



	arch_wb_cache_pmem(addr, size);