Commit 9566b892 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ira Weiny
Browse files

nvdimm: remove nd_integrity_init 



nd_integrity_init is only called from a single place.  Open code it
there, and use IS_ENABLED to remove the need for an extra stub.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240306142739.237234-2-hch@lst.de


Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
parent 2c720b49

drivers/nvdimm/btt.c

+8 −4
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/highmem.h>

#include <linux/debugfs.h>

#include <linux/blkdev.h>

#include <linux/blk-integrity.h>

#include <linux/pagemap.h>

#include <linux/module.h>

#include <linux/device.h>
@@ -1514,10 +1515,13 @@ static int btt_blk_init(struct btt *btt) 
	blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_disk->queue);

	blk_queue_flag_set(QUEUE_FLAG_SYNCHRONOUS, btt->btt_disk->queue);



	if (btt_meta_size(btt)) {

		rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));

		if (rc)

			goto out_cleanup_disk;

	if (btt_meta_size(btt) && IS_ENABLED(CONFIG_BLK_DEV_INTEGRITY)) {

		struct blk_integrity bi = {

			.tuple_size	= btt_meta_size(btt),

			.tag_size	= btt_meta_size(btt),

		};

		blk_integrity_register(btt->btt_disk, &bi);

		blk_queue_max_integrity_segments(btt->btt_disk->queue, 1);

	}



	set_capacity(btt->btt_disk, btt->nlba * btt->sector_size >> 9);

drivers/nvdimm/core.c

+0 −30
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/export.h>

#include <linux/module.h>

#include <linux/blkdev.h>

#include <linux/blk-integrity.h>

#include <linux/device.h>

#include <linux/ctype.h>

#include <linux/ndctl.h>
@@ -508,35 +507,6 @@ int nvdimm_bus_add_badrange(struct nvdimm_bus *nvdimm_bus, u64 addr, u64 length) 
}

EXPORT_SYMBOL_GPL(nvdimm_bus_add_badrange);



#ifdef CONFIG_BLK_DEV_INTEGRITY

int nd_integrity_init(struct gendisk *disk, unsigned long meta_size)

{

	struct blk_integrity bi;



	if (meta_size == 0)

		return 0;



	memset(&bi, 0, sizeof(bi));



	bi.tuple_size = meta_size;

	bi.tag_size = meta_size;



	blk_integrity_register(disk, &bi);

	blk_queue_max_integrity_segments(disk->queue, 1);



	return 0;

}

EXPORT_SYMBOL(nd_integrity_init);



#else /* CONFIG_BLK_DEV_INTEGRITY */

int nd_integrity_init(struct gendisk *disk, unsigned long meta_size)

{

	return 0;

}

EXPORT_SYMBOL(nd_integrity_init);



#endif



static __init int libnvdimm_init(void)

{

	int rc;

drivers/nvdimm/nd.h

+0 −1
Original line number Diff line number Diff line
@@ -489,7 +489,6 @@ enum nd_async_mode { 
	ND_ASYNC,

};



int nd_integrity_init(struct gendisk *disk, unsigned long meta_size);

void wait_nvdimm_bus_probe_idle(struct device *dev);

void nd_device_register(struct device *dev);

void nd_device_unregister(struct device *dev, enum nd_async_mode mode);