diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/hosts.c | 2 | ||||
-rw-r--r-- | drivers/scsi/scsi_scan.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 8a8f803439e1..ba7f87acc00d 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
@@ -411,9 +411,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) | |||
411 | 411 | ||
412 | device_initialize(&shost->shost_gendev); | 412 | device_initialize(&shost->shost_gendev); |
413 | dev_set_name(&shost->shost_gendev, "host%d", shost->host_no); | 413 | dev_set_name(&shost->shost_gendev, "host%d", shost->host_no); |
414 | #ifndef CONFIG_SYSFS_DEPRECATED | ||
415 | shost->shost_gendev.bus = &scsi_bus_type; | 414 | shost->shost_gendev.bus = &scsi_bus_type; |
416 | #endif | ||
417 | shost->shost_gendev.type = &scsi_host_type; | 415 | shost->shost_gendev.type = &scsi_host_type; |
418 | 416 | ||
419 | device_initialize(&shost->shost_dev); | 417 | device_initialize(&shost->shost_dev); |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 3d0a1e6e9c48..087821fac8fe 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
@@ -417,9 +417,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent, | |||
417 | starget->reap_ref = 1; | 417 | starget->reap_ref = 1; |
418 | dev->parent = get_device(parent); | 418 | dev->parent = get_device(parent); |
419 | dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id); | 419 | dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id); |
420 | #ifndef CONFIG_SYSFS_DEPRECATED | ||
421 | dev->bus = &scsi_bus_type; | 420 | dev->bus = &scsi_bus_type; |
422 | #endif | ||
423 | dev->type = &scsi_target_type; | 421 | dev->type = &scsi_target_type; |
424 | starget->id = id; | 422 | starget->id = id; |
425 | starget->channel = channel; | 423 | starget->channel = channel; |