lkml.org 
[lkml]   [2003]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH] Driver Core fixes for 2.6.0-test3
From
Date
ChangeSet 1.1152.2.6, 2003/08/15 10:08:00-07:00, greg@kroah.com

Remove usage of struct device.name from scsi core


drivers/scsi/scsi_debug.c | 2 --
drivers/scsi/scsi_scan.c | 20 --------------------
drivers/scsi/scsi_sysfs.c | 2 --
3 files changed, 24 deletions(-)


diff -Nru a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
--- a/drivers/scsi/scsi_debug.c Fri Aug 15 11:15:52 2003
+++ b/drivers/scsi/scsi_debug.c Fri Aug 15 11:15:52 2003
@@ -1566,7 +1566,6 @@
module_exit(scsi_debug_exit);

static struct device pseudo_primary = {
- .name = "Host/Pseudo Bridge",
.bus_id = "pseudo_0",
};

@@ -1630,7 +1629,6 @@
sdbg_host->dev.bus = &pseudo_lld_bus;
sdbg_host->dev.parent = &pseudo_primary;
sdbg_host->dev.release = &sdebug_release_adapter;
- sprintf(sdbg_host->dev.name, "scsi debug adapter");
sprintf(sdbg_host->dev.bus_id, "adapter%d", scsi_debug_add_host);

error = device_register(&sdbg_host->dev);
diff -Nru a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
--- a/drivers/scsi/scsi_scan.c Fri Aug 15 11:15:52 2003
+++ b/drivers/scsi/scsi_scan.c Fri Aug 15 11:15:52 2003
@@ -447,24 +447,6 @@
return;
}

-static void scsi_set_name(struct scsi_device *sdev, char *inq_result)
-{
- int i;
- char type[72];
-
- i = inq_result[0] & 0x1f;
- if (i < MAX_SCSI_DEVICE_CODE)
- strcpy(type, scsi_device_types[i]);
- else
- strcpy(type, "Unknown");
-
- i = strlen(type) - 1;
- while (i >= 0 && type[i] == ' ')
- type[i--] = '\0';
-
- snprintf(sdev->sdev_gendev.name, DEVICE_NAME_SIZE, "SCSI %s", type);
-}
-
/**
* scsi_add_lun - allocate and fully initialze a Scsi_Device
* @sdevscan: holds information to be stored in the new Scsi_Device
@@ -538,8 +520,6 @@
default:
printk(KERN_INFO "scsi: unknown device type %d\n", sdev->type);
}
-
- scsi_set_name(sdev, inq_result);

print_inquiry(inq_result);

diff -Nru a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
--- a/drivers/scsi/scsi_sysfs.c Fri Aug 15 11:15:52 2003
+++ b/drivers/scsi/scsi_sysfs.c Fri Aug 15 11:15:52 2003
@@ -408,8 +408,6 @@
device_initialize(&shost->shost_gendev);
snprintf(shost->shost_gendev.bus_id, BUS_ID_SIZE, "host%d",
shost->host_no);
- snprintf(shost->shost_gendev.name, DEVICE_NAME_SIZE, "%s",
- shost->hostt->proc_name);
shost->shost_gendev.release = scsi_host_dev_release;

class_device_initialize(&shost->shost_classdev);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:47    [W:0.067 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site