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>

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index a49914de4b954806fb988d0e4e12d96d753126a5..fe546e65dc11cd24b23d0396b8ee1a93bcf5d94a 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -33,9 +33,7 @@
 /*
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION                                "06.805.06.00-rc1"
-#define MEGASAS_RELDATE                                "Sep. 4, 2014"
-#define MEGASAS_EXT_VERSION                    "Thu. Sep. 4 17:00:00 PDT 2014"
+#define MEGASAS_VERSION                                "06.805.06.01-rc1"
 
 /*
  * Device IDs

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 107244cebd223a08071ced9cc56b75a8ba02aa84..bf97f3b6494b1ccfc921ba9f8a60def2378ac824 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -6398,16 +6398,6 @@ static ssize_t megasas_sysfs_show_version(struct device_driver *dd, char *buf)
 
 static DRIVER_ATTR(version, S_IRUGO, megasas_sysfs_show_version, NULL);
 
-static ssize_t
-megasas_sysfs_show_release_date(struct device_driver *dd, char *buf)
-{
-       return snprintf(buf, strlen(MEGASAS_RELDATE) + 2, "%s\n",
-                       MEGASAS_RELDATE);
-}
-
-static DRIVER_ATTR(release_date, S_IRUGO, megasas_sysfs_show_release_date,
-                  NULL);
-
 static ssize_t
 megasas_sysfs_show_support_poll_for_event(struct device_driver *dd, char *buf)
 {
@@ -6711,8 +6701,7 @@ static int __init megasas_init(void)
        /*
         * Announce driver version and other information
         */
-       printk(KERN_INFO "megasas: %s %s\n", MEGASAS_VERSION,
-              MEGASAS_EXT_VERSION);
+       pr_info("megasas: %s\n", MEGASAS_VERSION);
 
        spin_lock_init(&poll_aen_lock);
 
@@ -6747,10 +6736,6 @@ static int __init megasas_init(void)
                                  &driver_attr_version);
        if (rval)
                goto err_dcf_attr_ver;
-       rval = driver_create_file(&megasas_pci_driver.driver,
-                                 &driver_attr_release_date);
-       if (rval)
-               goto err_dcf_rel_date;
 
        rval = driver_create_file(&megasas_pci_driver.driver,
                                &driver_attr_support_poll_for_event);
@@ -6774,12 +6759,7 @@ err_dcf_support_device_change:
 err_dcf_dbg_lvl:
        driver_remove_file(&megasas_pci_driver.driver,
                        &driver_attr_support_poll_for_event);
-
 err_dcf_support_poll_for_event:
-       driver_remove_file(&megasas_pci_driver.driver,
-                          &driver_attr_release_date);
-
-err_dcf_rel_date:
        driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version);
 err_dcf_attr_ver:
        pci_unregister_driver(&megasas_pci_driver);
@@ -6799,8 +6779,6 @@ static void __exit megasas_exit(void)
                        &driver_attr_support_poll_for_event);
        driver_remove_file(&megasas_pci_driver.driver,
                        &driver_attr_support_device_change);
-       driver_remove_file(&megasas_pci_driver.driver,
-                          &driver_attr_release_date);
        driver_remove_file(&megasas_pci_driver.driver, &driver_attr_version);
 
        pci_unregister_driver(&megasas_pci_driver);