diff options
author | Len Brown <len.brown@intel.com> | 2008-01-25 15:40:02 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-03 17:37:02 -0500 |
commit | e6298c6d60838495978cdbe5555dc290785bb961 (patch) | |
tree | 935a2641d166372715701eec7e99bb0041bfa30e /drivers | |
parent | 8964ebb8c35533f4084cc667079a0ce620356104 (diff) |
DMI: remove duplicate helper routine
Use existing dmi_get_system_info(),
Delete duplicate dmi_get_slot()
Spotted-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/osl.c | 12 | ||||
-rw-r--r-- | drivers/firmware/dmi_scan.c | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index e53fb516f9d4..347cda21c0ed 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -1220,17 +1220,17 @@ int acpi_dmi_dump(void) | |||
1220 | return -1; | 1220 | return -1; |
1221 | 1221 | ||
1222 | printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n", | 1222 | printk(KERN_NOTICE PREFIX "DMI System Vendor: %s\n", |
1223 | dmi_get_slot(DMI_SYS_VENDOR)); | 1223 | dmi_get_system_info(DMI_SYS_VENDOR)); |
1224 | printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n", | 1224 | printk(KERN_NOTICE PREFIX "DMI Product Name: %s\n", |
1225 | dmi_get_slot(DMI_PRODUCT_NAME)); | 1225 | dmi_get_system_info(DMI_PRODUCT_NAME)); |
1226 | printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n", | 1226 | printk(KERN_NOTICE PREFIX "DMI Product Version: %s\n", |
1227 | dmi_get_slot(DMI_PRODUCT_VERSION)); | 1227 | dmi_get_system_info(DMI_PRODUCT_VERSION)); |
1228 | printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n", | 1228 | printk(KERN_NOTICE PREFIX "DMI Board Name: %s\n", |
1229 | dmi_get_slot(DMI_BOARD_NAME)); | 1229 | dmi_get_system_info(DMI_BOARD_NAME)); |
1230 | printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n", | 1230 | printk(KERN_NOTICE PREFIX "DMI BIOS Vendor: %s\n", |
1231 | dmi_get_slot(DMI_BIOS_VENDOR)); | 1231 | dmi_get_system_info(DMI_BIOS_VENDOR)); |
1232 | printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n", | 1232 | printk(KERN_NOTICE PREFIX "DMI BIOS Date: %s\n", |
1233 | dmi_get_slot(DMI_BIOS_DATE)); | 1233 | dmi_get_system_info(DMI_BIOS_DATE)); |
1234 | 1234 | ||
1235 | return 0; | 1235 | return 0; |
1236 | } | 1236 | } |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 9008ed5ef4ce..e0bade732376 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
@@ -489,12 +489,3 @@ int dmi_get_year(int field) | |||
489 | 489 | ||
490 | return year; | 490 | return year; |
491 | } | 491 | } |
492 | |||
493 | /** | ||
494 | * dmi_get_slot - return dmi_ident[slot] | ||
495 | * @slot: index into dmi_ident[] | ||
496 | */ | ||
497 | char *dmi_get_slot(int slot) | ||
498 | { | ||
499 | return(dmi_ident[slot]); | ||
500 | } | ||