nvme: simplify nvme_dev_attrs_are_visible

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 3593abf3c806fe7b810f1e28d039a4ea58afcb0a..d70df1d0072d434eb6addd99308a17a52e381782 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -2191,23 +2191,16 @@ static struct attribute *nvme_dev_attrs[] = {
        NULL
 };
 
-#define CHECK_ATTR(ctrl, a, name)              \
-       if ((a) == &dev_attr_##name.attr &&     \
-           !(ctrl)->ops->get_##name)           \
-               return 0
-
 static umode_t nvme_dev_attrs_are_visible(struct kobject *kobj,
                struct attribute *a, int n)
 {
        struct device *dev = container_of(kobj, struct device, kobj);
        struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
 
-       if (a == &dev_attr_delete_controller.attr) {
-               if (!ctrl->ops->delete_ctrl)
-                       return 0;
-       }
-
-       CHECK_ATTR(ctrl, a, address);
+       if (a == &dev_attr_delete_controller.attr && !ctrl->ops->delete_ctrl)
+               return 0;
+       if (a == &dev_attr_address.attr && !ctrl->ops->get_address)
+               return 0;
 
        return a->mode;
 }