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

Commit b1aafb35 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: remove nvme_ns_config_oncs 



Just opencode the two function calls in the caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Tested-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 7b210e4e

drivers/nvme/host/core.c

+3 −7
Original line number Diff line number Diff line
@@ -1552,12 +1552,6 @@ static inline void nvme_config_write_zeroes(struct nvme_ns *ns) 
	blk_queue_max_write_zeroes_sectors(ns->queue, max_sectors);

}



static inline void nvme_ns_config_oncs(struct nvme_ns *ns)

{

	nvme_config_discard(ns);

	nvme_config_write_zeroes(ns);

}



static void nvme_report_ns_ids(struct nvme_ctrl *ctrl, unsigned int nsid,

		struct nvme_id_ns *id, struct nvme_ns_ids *ids)

{
@@ -1611,7 +1605,9 @@ static void nvme_update_disk_info(struct gendisk *disk, 
		capacity = 0;



	set_capacity(disk, capacity);

	nvme_ns_config_oncs(ns);



	nvme_config_discard(ns);

	nvme_config_write_zeroes(ns);



	if (id->nsattr & (1 << 0))

		set_disk_ro(disk, true);