diff options
author | Sumit.Saxena@avagotech.com <Sumit.Saxena@avagotech.com> | 2014-11-17 04:53:58 -0500 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2014-11-24 08:38:37 -0500 |
commit | d98a6deb75bce12784c0c7f1fdc02e6a67adac4d (patch) | |
tree | e3aa716b22ea1fcaa7198da68ca48a7b920b714e /drivers/scsi/megaraid | |
parent | 18f87a67e6d681d1c6f8b3c47985f21b25959a77 (diff) |
megaraid_sas: driver version upgrade and remove some meta data of driver
Update driver version and remove some meta data (release date and extended
version) about megaraid_sas driver.
Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.h | 4 | ||||
-rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 24 |
2 files changed, 2 insertions, 26 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index a49914de4b95..fe546e65dc11 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h | |||
@@ -33,9 +33,7 @@ | |||
33 | /* | 33 | /* |
34 | * MegaRAID SAS Driver meta data | 34 | * MegaRAID SAS Driver meta data |
35 | */ | 35 | */ |
36 | #define MEGASAS_VERSION "06.805.06.00-rc1" | 36 | #define MEGASAS_VERSION "06.805.06.01-rc1" |
37 | #define MEGASAS_RELDATE "Sep. 4, 2014" | ||
38 | #define MEGASAS_EXT_VERSION "Thu. Sep. 4 17:00:00 PDT 2014" | ||
39 | 37 | ||
40 | /* | 38 | /* |
41 | * Device IDs | 39 | * Device IDs |
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 107244cebd22..bf97f3b6494b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c | |||
@@ -6399,16 +6399,6 @@ static ssize_t megasas_sysfs_show_version(struct device_driver *dd, char *buf) | |||
6399 | static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL); | 6399 | static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL); |
6400 | 6400 | ||
6401 | static ssize_t | 6401 | static ssize_t |
6402 | megasas_sysfs_show_release_date(struct device_driver *dd, char *buf) | ||
6403 | { | ||
6404 | return snprintf(buf, strlen(MEGASAS_RELDATE) + 2, "%s\n", | ||
6405 | MEGASAS_RELDATE); | ||
6406 | } | ||
6407 | |||
6408 | static DRIVER_ATTR(release_date, S_IRUGO, megasas_sysfs_show_release_date, | ||
6409 | NULL); | ||
6410 | |||
6411 | static ssize_t | ||
6412 | megasas_sysfs_show_support_poll_for_event(struct device_driver *dd, char *buf) | 6402 | megasas_sysfs_show_support_poll_for_event(struct device_driver *dd, char *buf) |
6413 | { | 6403 | { |
6414 | return sprintf(buf, "%u\n", support_poll_for_event); | 6404 | return sprintf(buf, "%u\n", support_poll_for_event); |
@@ -6711,8 +6701,7 @@ static int __init megasas_init(void) | |||
6711 | /* | 6701 | /* |
6712 | * Announce driver version and other information | 6702 | * Announce driver version and other information |
6713 | */ | 6703 | */ |
6714 | printk(KERN_INFO "megasas: %s %s\n", MEGASAS_VERSION, | 6704 | pr_info("megasas: %s\n", MEGASAS_VERSION); |
6715 | MEGASAS_EXT_VERSION); | ||
6716 | 6705 | ||
6717 | spin_lock_init(&poll_aen_lock); | 6706 | spin_lock_init(&poll_aen_lock); |
6718 | 6707 | ||
@@ -6747,10 +6736,6 @@ static int __init megasas_init(void) | |||
6747 | &driver_attr_version); | 6736 | &driver_attr_version); |
6748 | if (rval) | 6737 | if (rval) |
6749 | goto err_dcf_attr_ver; | 6738 | goto err_dcf_attr_ver; |
6750 | rval = driver_create_file(&megasas_pci_driver.driver, | ||
6751 | &driver_attr_release_date); | ||
6752 | if (rval) | ||
6753 | goto err_dcf_rel_date; | ||
6754 | 6739 | ||
6755 | rval = driver_create_file(&megasas_pci_driver.driver, | 6740 | rval = driver_create_file(&megasas_pci_driver.driver, |
6756 | &driver_attr_support_poll_for_event); | 6741 | &driver_attr_support_poll_for_event); |
@@ -6774,12 +6759,7 @@ err_dcf_support_device_change: | |||
6774 | err_dcf_dbg_lvl: | 6759 | err_dcf_dbg_lvl: |
6775 | driver_remove_file(&megasas_pci_driver.driver, | 6760 | driver_remove_file(&megasas_pci_driver.driver, |
6776 | &driver_attr_support_poll_for_event); | 6761 | &driver_attr_support_poll_for_event); |
6777 | |||
6778 | err_dcf_support_poll_for_event: | 6762 | err_dcf_support_poll_for_event: |
6779 | driver_remove_file(&megasas_pci_driver.driver, | ||
6780 | &driver_attr_release_date); | ||
6781 | |||
6782 | err_dcf_rel_date: | ||
6783 | driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version); | 6763 | driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version); |
6784 | err_dcf_attr_ver: | 6764 | err_dcf_attr_ver: |
6785 | pci_unregister_driver(&megasas_pci_driver); | 6765 | pci_unregister_driver(&megasas_pci_driver); |
@@ -6799,8 +6779,6 @@ static void __exit megasas_exit(void) | |||
6799 | &driver_attr_support_poll_for_event); | 6779 | &driver_attr_support_poll_for_event); |
6800 | driver_remove_file(&megasas_pci_driver.driver, | 6780 | driver_remove_file(&megasas_pci_driver.driver, |
6801 | &driver_attr_support_device_change); | 6781 | &driver_attr_support_device_change); |
6802 | driver_remove_file(&megasas_pci_driver.driver, | ||
6803 | &driver_attr_release_date); | ||
6804 | driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version); | 6782 | driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version); |
6805 | 6783 | ||
6806 | pci_unregister_driver(&megasas_pci_driver); | 6784 | pci_unregister_driver(&megasas_pci_driver); |