diff options
| author | Christoph Hellwig <hch@lst.de> | 2022-04-20 06:27:11 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-05-02 22:06:20 +0200 |
| commit | c814153c83a892dfd42026eaa661ae2c1f298792 (patch) | |
| tree | bd5638bb77287174ffda85bd26d53765d882cb85 /drivers/nvme | |
| parent | nvme-fc: don't support the appid attribute without CONFIG_BLK_CGROUP_FC_APPID (diff) | |
| download | linux-c814153c83a892dfd42026eaa661ae2c1f298792.tar.xz linux-c814153c83a892dfd42026eaa661ae2c1f298792.zip | |
nvme-fc: fold t fc_update_appid into fc_appid_store
No need for this wrapper.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20220420042723.1010598-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/fc.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index caa0fff7bf1f..7ae72c7a211b 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -3857,12 +3857,10 @@ static int fc_parse_cgrpid(const char *buf, u64 *id) } /* - * fc_update_appid: Parse and update the appid in the blkcg associated with - * cgroupid. - * @buf: buf contains both cgrpid and appid info - * @count: size of the buffer + * Parse and update the appid in the blkcg associated with the cgroupid. */ -static int fc_update_appid(const char *buf, size_t count) +static ssize_t fc_appid_store(struct device *dev, + struct device_attribute *attr, const char *buf, size_t count) { u64 cgrp_id; int appid_len = 0; @@ -3890,17 +3888,6 @@ static int fc_update_appid(const char *buf, size_t count) return ret; return count; } - -static ssize_t fc_appid_store(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) -{ - int ret = 0; - - ret = fc_update_appid(buf, count); - if (ret < 0) - return -EINVAL; - return count; -} static DEVICE_ATTR(appid_store, 0200, NULL, fc_appid_store); #endif /* CONFIG_BLK_CGROUP_FC_APPID */ |