From 94fbc490911d254bf30d2edafbb453b2fe4b2cef Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 24 Jul 2012 18:50:59 +0000 Subject: [PATCH] Fix qla2x00t compilation warnings on RHEL 6.1 The attached patch fixes compilation warnings for the qla2x00t driver when compiled by RHEL 6.1, kernel version 2.6.32-131.0.15.el6. I believe this is the second kernel version for RHEL 6.1. From "Robinson, Herbie" git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@4419 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_attr.c | 20 ++++++++++---------- qla2x00t/qla_os.c | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qla2x00t/qla_attr.c b/qla2x00t/qla_attr.c index 08ab438a8..070cb4295 100644 --- a/qla2x00t/qla_attr.c +++ b/qla2x00t/qla_attr.c @@ -540,7 +540,7 @@ static DEVICE_ATTR(port_database, static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_read_fw_dump( #else qla2x00_sysfs_read_fw_dump(struct file *file, @@ -568,7 +568,7 @@ qla2x00_sysfs_read_fw_dump(struct file *file, static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_write_fw_dump( #else qla2x00_sysfs_write_fw_dump(struct file *file, @@ -628,7 +628,7 @@ static struct bin_attribute sysfs_fw_dump_attr = { static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_read_nvram( #else qla2x00_sysfs_read_nvram(struct file *file, @@ -658,7 +658,7 @@ qla2x00_sysfs_read_nvram(struct file *file, static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_write_nvram( #else qla2x00_sysfs_write_nvram(struct file *file, @@ -720,7 +720,7 @@ static struct bin_attribute sysfs_nvram_attr = { static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_read_optrom( #else qla2x00_sysfs_read_optrom(struct file *file, @@ -747,7 +747,7 @@ qla2x00_sysfs_read_optrom(struct file *file, static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_write_optrom( #else qla2x00_sysfs_write_optrom(struct file *file, @@ -784,7 +784,7 @@ static struct bin_attribute sysfs_optrom_attr = { static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_write_optrom_ctl( #else qla2x00_sysfs_write_optrom_ctl(struct file *file, @@ -943,7 +943,7 @@ static struct bin_attribute sysfs_optrom_ctl_attr = { static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_read_vpd( #else qla2x00_sysfs_read_vpd(struct file *file, @@ -973,7 +973,7 @@ qla2x00_sysfs_read_vpd(struct file *file, static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_write_vpd( #else qla2x00_sysfs_write_vpd(struct file *file, @@ -1008,7 +1008,7 @@ static struct bin_attribute sysfs_vpd_attr = { static ssize_t #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) qla2x00_sysfs_read_sfp( #else qla2x00_sysfs_read_sfp(struct file *file, diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c index 0922259eb..dc8f11b41 100644 --- a/qla2x00t/qla_os.c +++ b/qla2x00t/qla_os.c @@ -150,7 +150,7 @@ static int qla2xxx_eh_host_reset(struct scsi_cmnd *); #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && \ !defined(CONFIG_SUSE_KERNEL) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) static int qla2x00_change_queue_depth(struct scsi_device *, int); #else static int qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, @@ -1205,7 +1205,7 @@ qla2xxx_slave_destroy(struct scsi_device *sdev) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && \ !defined(CONFIG_SUSE_KERNEL) && \ (!defined(RHEL_RELEASE_CODE) || \ - RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) + RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) static int qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth) @@ -1214,7 +1214,7 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth) return sdev->queue_depth; } -#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) && (!defined(RHEL_RELEASE_CODE) || RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) */ +#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) && (!defined(RHEL_RELEASE_CODE) || RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) */ static void qla2x00_handle_queue_full(struct scsi_device *sdev, int qdepth) { @@ -1267,7 +1267,7 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason) return sdev->queue_depth; } -#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) && (!defined(RHEL_RELEASE_CODE) || RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 2)) */ +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) && (!defined(RHEL_RELEASE_CODE) || RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) */ static int qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)