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

Commit de1dee78 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
synchronously.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6716d289

drivers/scsi/scsi_sysfs.c

+2 −13
Original line number Diff line number Diff line
@@ -635,23 +635,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)

{

	scsi_remove_device(to_scsi_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))

		scsi_remove_device(to_scsi_device(dev));

	return count;

};

static DEVICE_ATTR(delete, S_IWUSR, NULL, sdev_store_delete);