From a85d72a4e21e94a7a92ea1b46f8fe57d431db519 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 21 Jun 2012 23:36:25 -0700 Subject: [PATCH] --- yaml --- r: 316814 b: refs/heads/master c: a494fd5bd98bb35d5a9a274fecb768e14ebf499c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_discover.c | 6 ------ trunk/include/scsi/libsas.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index e3f7860af4c0..a97b80d49656 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b17caa174a7e1fd2e17b26e210d4ee91c4c28b37 +refs/heads/master: a494fd5bd98bb35d5a9a274fecb768e14ebf499c diff --git a/trunk/drivers/scsi/libsas/sas_discover.c b/trunk/drivers/scsi/libsas/sas_discover.c index b031d238eb7b..3e9dc1a84358 100644 --- a/trunk/drivers/scsi/libsas/sas_discover.c +++ b/trunk/drivers/scsi/libsas/sas_discover.c @@ -46,12 +46,6 @@ void sas_init_dev(struct domain_device *dev) INIT_LIST_HEAD(&dev->ex_dev.children); mutex_init(&dev->ex_dev.cmd_mutex); break; - case SATA_DEV: - case SATA_PM: - case SATA_PM_PORT: - case SATA_PENDING: - INIT_LIST_HEAD(&dev->sata_dev.children); - break; default: break; } diff --git a/trunk/include/scsi/libsas.h b/trunk/include/scsi/libsas.h index acefe13ebacf..29a8cc7831af 100644 --- a/trunk/include/scsi/libsas.h +++ b/trunk/include/scsi/libsas.h @@ -169,7 +169,6 @@ struct sata_device { enum ata_command_set command_set; struct smp_resp rps_resp; /* report_phy_sata_resp */ u8 port_no; /* port number, if this is a PM (Port) */ - struct list_head children; /* PM Ports if this is a PM */ struct ata_port *ap; struct ata_host ata_host;