Commit 0c22ecde authored Feb 18, 2012 by Stefan Richter

firewire: sbp2: identify to driver core as "firewire_sbp2", not "sbp2"



Commit eba9ebaa "firewire: sbp2: use dev_printk API" changed
messages from e.g.
    firewire_sbp2: fw3.0: logged in to LUN 0000 (0 retries)
to
    sbp2 fw3.0: logged in to LUN 0000 (0 retries)
because the driver calls itself as "sbp2" when registering with driver
core and with SCSI core.  This is of course confusing, so switch to the
name "firewire_sbp2" for driver core in order to match what lsmod and
/sys/module/ show.  So we are back to
    firewire_sbp2 fw3.0: logged in to LUN 0000 (0 retries)
in the kernel log.

This also changes
    /sys/bus/firewire/drivers/sbp2
    /sys/bus/firewire/devices/fw3.0/driver -> [...]/sbp2
    /sys/module/firewire_sbp2/drivers/firewire:sbp2
to
    /sys/bus/firewire/drivers/firewire_sbp2
    /sys/bus/firewire/devices/fw3.0/driver -> [...]/firewire_sbp2
    /sys/module/firewire_sbp2/drivers/firewire:firewire_sbp2

but "cat /sys/class/scsi_host/host27/proc_name" stays "sbp2" just in
case that proc_name is used by any userland.

The transport detection in lsscsi is not affected.  (Tested with lsscsi
version 0.25.)  Udev's /dev/disk/by-id and by-path symlinks are not
affected either.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

parent eba9ebaa

drivers/firewire/sbp2.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -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,

Admin message