From 7b228d4d6b2022ec9e169f0e0ce66ccf74916a80 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sat, 18 Feb 2012 22:01:14 +0100 Subject: [PATCH] --- yaml --- r: 294111 b: refs/heads/master c: 0c22ecdebb65b96408c5c369321702f0dee908ee h: refs/heads/master i: 294109: 30486a621b0fdf749bfe1569953e347ed430051f 294107: 227181d0d896397ff58e49028bd390a58524c4dc 294103: a5ecb3affc51e677e581da82b050ab0cfdb023e4 294095: 85850e94c1b42b7ff8e2e8361bd538a4628c1939 294079: 2121bf9206a925d86bb45bfed2e210cb079e0704 v: v3 --- [refs] | 2 +- trunk/drivers/firewire/sbp2.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b8b9afa4dc85..56c61682ff5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eba9ebaaa26d60e07bc0aea585c13bc1d5a728c1 +refs/heads/master: 0c22ecdebb65b96408c5c369321702f0dee908ee diff --git a/trunk/drivers/firewire/sbp2.c b/trunk/drivers/firewire/sbp2.c index 32b3296a1c51..481e1c855c55 100644 --- a/trunk/drivers/firewire/sbp2.c +++ b/trunk/drivers/firewire/sbp2.c @@ -125,8 +125,6 @@ MODULE_PARM_DESC(workarounds, "Work around device bugs (default = 0" ", override internal blacklist = " __stringify(SBP2_WORKAROUND_OVERRIDE) ", or a combination)"); -static const char sbp2_driver_name[] = "sbp2"; - /* * We create one struct sbp2_logical_unit per SBP-2 Logical Unit Number Entry * and one struct scsi_device per sbp2_logical_unit. @@ -1270,7 +1268,7 @@ static const struct ieee1394_device_id sbp2_id_table[] = { static struct fw_driver sbp2_driver = { .driver = { .owner = THIS_MODULE, - .name = sbp2_driver_name, + .name = KBUILD_MODNAME, .bus = &fw_bus_type, .probe = sbp2_probe, .remove = sbp2_remove, @@ -1599,7 +1597,7 @@ static struct device_attribute *sbp2_scsi_sysfs_attrs[] = { static struct scsi_host_template scsi_driver_template = { .module = THIS_MODULE, .name = "SBP-2 IEEE-1394", - .proc_name = sbp2_driver_name, + .proc_name = "sbp2", .queuecommand = sbp2_scsi_queuecommand, .slave_alloc = sbp2_scsi_slave_alloc, .slave_configure = sbp2_scsi_slave_configure,