xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] ses: add support for enclosure component hot removal

Browse Source 
Right at the moment, hot removal of a device within an enclosure does
nothing (because the intf_remove only copes with enclosure removal not
with component removal). Fix this by adding a function to remove the
component.  Also needed to fix the prototype of
enclosure_remove_device, since we know the device we've removed but
not the internal component number

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
James Bottomley
2009-08-01 00:41:22 +00:00
committed by James Bottomley
parent 163f52b6cf
commit 43d8eb9cfd
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/scsi/ses.c
View File

@@ -616,18 +616,26 @@ static int ses_remove(struct device *dev)
return 0;
}
static void ses_intf_remove(struct device *cdev,
struct class_interface *intf)
static void ses_intf_remove_component(struct scsi_device *sdev)
{
struct enclosure_device *edev, *prev = NULL;
while ((edev = enclosure_find(&sdev->host->shost_gendev, prev)) != NULL) {
prev = edev;
if (!enclosure_remove_device(edev, &sdev->sdev_gendev))
break;
}
if (edev)
put_device(&edev->edev);
}
static void ses_intf_remove_enclosure(struct scsi_device *sdev)
{
struct scsi_device *sdev = to_scsi_device(cdev->parent);
struct enclosure_device *edev;
struct ses_device *ses_dev;
if (!scsi_device_enclosure(sdev))
return;
/* exact match to this enclosure */
edev = enclosure_find(cdev->parent, NULL);
edev = enclosure_find(&sdev->sdev_gendev, NULL);
if (!edev)
return;
@@ -645,6 +653,17 @@ static void ses_intf_remove(struct device *cdev,
enclosure_unregister(edev);
}
static void ses_intf_remove(struct device *cdev,
struct class_interface *intf)
{
struct scsi_device *sdev = to_scsi_device(cdev->parent);
if (!scsi_device_enclosure(sdev))
ses_intf_remove_component(sdev);
else
ses_intf_remove_enclosure(sdev);
}
static struct class_interface ses_interface = {
.add_dev = ses_intf_add,
.remove_dev = ses_intf_remove,