Merge tag 'flex-array-transformations-6.6-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / block / blk-integrity.c

diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index 1cbfdea..d4e9b45 100644 (file)
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -212,31 +212,6 @@ bool blk_integrity_merge_bio(struct request_queue *q, struct request *req,
        return true;
 }
 
-static ssize_t integrity_attr_show(struct kobject *kobj, struct attribute *attr,
-                                  char *page)
-{
-       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
-       struct device *dev = disk_to_dev(disk);
-       struct device_attribute *dev_attr =
-               container_of(attr, struct device_attribute, attr);
-
-       return dev_attr->show(dev, dev_attr, page);
-}
-
-static ssize_t integrity_attr_store(struct kobject *kobj,
-                                   struct attribute *attr, const char *page,
-                                   size_t count)
-{
-       struct gendisk *disk = container_of(kobj, struct gendisk, integrity_kobj);
-       struct device *dev = disk_to_dev(disk);
-       struct device_attribute *dev_attr =
-               container_of(attr, struct device_attribute, attr);
-
-       if (!dev_attr->store)
-               return 0;
-       return dev_attr->store(dev, dev_attr, page, count);
-}
-
 static inline struct blk_integrity *dev_to_bi(struct device *dev)
 {
        return &dev_to_disk(dev)->queue->integrity;
@@ -345,16 +320,10 @@ static struct attribute *integrity_attrs[] = {
        &dev_attr_device_is_integrity_capable.attr,
        NULL
 };
-ATTRIBUTE_GROUPS(integrity);
 
-static const struct sysfs_ops integrity_ops = {
-       .show   = &integrity_attr_show,
-       .store  = &integrity_attr_store,
-};
-
-static const struct kobj_type integrity_ktype = {
-       .default_groups = integrity_groups,
-       .sysfs_ops      = &integrity_ops,
+const struct attribute_group blk_integrity_attr_group = {
+       .name = "integrity",
+       .attrs = integrity_attrs,
 };
 
 static blk_status_t blk_integrity_nop_fn(struct blk_integrity_iter *iter)
@@ -433,21 +402,3 @@ void blk_integrity_unregister(struct gendisk *disk)
        memset(bi, 0, sizeof(*bi));
 }
 EXPORT_SYMBOL(blk_integrity_unregister);
-
-int blk_integrity_add(struct gendisk *disk)
-{
-       int ret;
-
-       ret = kobject_init_and_add(&disk->integrity_kobj, &integrity_ktype,
-                                  &disk_to_dev(disk)->kobj, "%s", "integrity");
-       if (!ret)
-               kobject_uevent(&disk->integrity_kobj, KOBJ_ADD);
-       return ret;
-}
-
-void blk_integrity_del(struct gendisk *disk)
-{
-       kobject_uevent(&disk->integrity_kobj, KOBJ_REMOVE);
-       kobject_del(&disk->integrity_kobj);
-       kobject_put(&disk->integrity_kobj);
-}