Commit ac0ece91 authored by Tejun Heo's avatar Tejun Heo Committed by Greg Kroah-Hartman
Browse files

scsi: use device_remove_file_self() instead of device_schedule_callback()

driver-core now supports synchrnous self-deletion of attributes and
the asynchrnous removal mechanism is scheduled for removal.  Use it
instead of device_schedule_callback().  This makes "delete" behave
Signed-off-by: default avatarTejun Heo <>
Cc: "James E.J. Bottomley" <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent bc6caf02
......@@ -649,23 +649,12 @@ store_rescan_field (struct device *dev, struct device_attribute *attr,
static DEVICE_ATTR(rescan, S_IWUSR, NULL, store_rescan_field);
static void sdev_store_delete_callback(struct device *dev)
static ssize_t
sdev_store_delete(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
int rc;
/* An attribute cannot be unregistered by one of its own methods,
* so we have to use this roundabout approach.
rc = device_schedule_callback(dev, sdev_store_delete_callback);
if (rc)
count = rc;
if (device_remove_file_self(dev, attr))
return count;
static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment