diff options
author | Holger Macht <holger@homac.de> | 2012-06-25 04:13:02 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2012-06-29 11:38:09 -0400 |
commit | de50ada55b6b83b54b817911ec42dc590e1c1738 (patch) | |
tree | a01be5907effa3e64cf3b9b65b963a8785f42889 /drivers/scsi/scsi_lib.c | |
parent | 9acc7bde23ebb19a704395f76490685e1513e422 (diff) |
[SCSI] add wrapper to access and set scsi_bus_type in struct acpi_bus_type
For being able to bind ata devices against acpi devices, scsi_bus_type
needs to be set as bus in struct acpi_bus_type. So add wrapper to
scsi_lib to accomplish that.
Signed-off-by: Holger Macht <holger@homac.de>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r-- | drivers/scsi/scsi_lib.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 6dfb9785d345..08f1e297c735 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -68,6 +68,23 @@ static struct scsi_host_sg_pool scsi_sg_pools[] = { | |||
68 | 68 | ||
69 | struct kmem_cache *scsi_sdb_cache; | 69 | struct kmem_cache *scsi_sdb_cache; |
70 | 70 | ||
71 | #ifdef CONFIG_ACPI | ||
72 | #include <acpi/acpi_bus.h> | ||
73 | |||
74 | int scsi_register_acpi_bus_type(struct acpi_bus_type *bus) | ||
75 | { | ||
76 | bus->bus = &scsi_bus_type; | ||
77 | return register_acpi_bus_type(bus); | ||
78 | } | ||
79 | EXPORT_SYMBOL_GPL(scsi_register_acpi_bus_type); | ||
80 | |||
81 | void scsi_unregister_acpi_bus_type(struct acpi_bus_type *bus) | ||
82 | { | ||
83 | unregister_acpi_bus_type(bus); | ||
84 | } | ||
85 | EXPORT_SYMBOL_GPL(scsi_unregister_acpi_bus_type); | ||
86 | #endif | ||
87 | |||
71 | /* | 88 | /* |
72 | * When to reinvoke queueing after a resource shortage. It's 3 msecs to | 89 | * When to reinvoke queueing after a resource shortage. It's 3 msecs to |
73 | * not change behaviour from the previous unplug mechanism, experimentation | 90 | * not change behaviour from the previous unplug mechanism, experimentation |