All of lore.kernel.org
 help / color / mirror / Atom feed
* RE: [2.6 patch] drivers/scsi/dpt*: remove version.h dependencies
@ 2005-04-15 12:56 ` Salyzyn, Mark
  0 siblings, 0 replies; 4+ messages in thread
From: Salyzyn, Mark @ 2005-04-15 12:56 UTC (permalink / raw)
  To: Adrian Bunk, James Bottomley
  Cc: Andrew Morton, SCSI Mailing List, Linux Kernel, Markus.Lidel


You can not remove the entries in sys_info.h (osMajorVersion & friends),
this communicates information to the application via the ioctls and the
structure shape is important. Change the code to zero the values, leave
osType set to OS_LINUX.

Sincerely -- Mark Salyzyn

-----Original Message-----
From: Adrian Bunk [mailto:bunk@stusta.de] 
Sent: Thursday, April 14, 2005 8:49 PM
To: James Bottomley
Cc: Andrew Morton; SCSI Mailing List; Linux Kernel;
Markus.Lidel@shadowconnect.com; Salyzyn, Mark
Subject: [2.6 patch] drivers/scsi/dpt*: remove version.h dependencies

On Sat, Apr 02, 2005 at 07:49:38AM -0600, James Bottomley wrote:
> On Sun, 2005-03-27 at 16:34 +0200, Adrian Bunk wrote:
> > This patch removes #if's for kernel 2.2 .
> 
> this one looks like it's not quite complete:
> 
> > -#ifndef LINUX_VERSION_CODE
> >  #include <linux/version.h>
> > -#endif
> 
> Once there are no more KERNEL_VERSION dependencies in a file, it's
> inclusion of linux/version.h can be removed also (and that should
> prevent it getting rebuilt every time the kernel version changes).
> 
> So it looks like there's an additional KERNEL_VERSION to remove in
> dpt/dpti_i2o.h version.h includes in dpti_i2o.h and dpt_i2o.c

Is the patch below what you want, or do I misunderstand your comment?

> Then when you have a final patch, could you cc Markus Lidel
> <Markus.Lidel@shadowconnect.com> and  
> 
> Mark_Salyzyn@adaptec.com
> 
> Thanks,
> 
> James

cu
Adrian


<--  snip  -->


This patch removes version.h dependencies.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

 drivers/scsi/dpt/sys_info.h |    4 ----
 drivers/scsi/dpt_i2o.c      |    5 -----
 drivers/scsi/dpti.h         |   12 ------------
 3 files changed, 21 deletions(-)

--- linux-2.6.12-rc2-mm3-full/drivers/scsi/dpti.h.old	2005-04-15
01:21:04.000000000 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/scsi/dpti.h	2005-04-15
01:21:26.000000000 +0200
@@ -20,15 +20,7 @@
 #ifndef _DPT_H
 #define _DPT_H
 
-#ifndef LINUX_VERSION_CODE
-#include <linux/version.h>
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,00)
-#define MAX_TO_IOP_MESSAGES   (210)
-#else
 #define MAX_TO_IOP_MESSAGES   (255)
-#endif
 #define MAX_FROM_IOP_MESSAGES (255)
 
 
@@ -321,10 +313,6 @@
 static void adpt_delay(int millisec);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static struct pci_dev* adpt_pci_find_device(uint vendor, struct
pci_dev* from);
-#endif
-
 #if defined __ia64__ 
 static void adpt_ia64_info(sysInfo_S* si);
 #endif
--- linux-2.6.12-rc2-mm3-full/drivers/scsi/dpt/sys_info.h.old
2005-04-15 01:23:52.000000000 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/scsi/dpt/sys_info.h
2005-04-15 01:24:13.000000000 +0200
@@ -146,10 +146,6 @@
    uSHORT       flags;                  /* See bit definitions above */
    uSHORT       conventionalMemSize;    /* in KB */
    uLONG        extendedMemSize;        /* in KB */
-   uLONG        osType;                 /* Same as DPTSIG's definition
*/
-   uCHAR        osMajorVersion;
-   uCHAR        osMinorVersion;         /* The OS version */
-   uCHAR        osRevision;
 #ifdef _SINIX_ADDON
    uCHAR        busType;                /* See defininitions above */
    uSHORT       osSubRevision;
--- linux-2.6.12-rc2-mm3-full/drivers/scsi/dpt_i2o.c.old
2005-04-15 01:21:48.000000000 +0200
+++ linux-2.6.12-rc2-mm3-full/drivers/scsi/dpt_i2o.c	2005-04-15
01:25:20.000000000 +0200
@@ -34,7 +34,6 @@
 
 #define ADDR32 (0)
 
-#include <linux/version.h>
 #include <linux/module.h>
 
 MODULE_AUTHOR("Deanna Bonds, with _lots_ of help from Mark Salyzyn");
@@ -1824,10 +1823,6 @@
 
 	memset(&si, 0, sizeof(si));
 
-	si.osType = OS_LINUX;
-	si.osMajorVersion = (u8) (LINUX_VERSION_CODE >> 16);
-	si.osMinorVersion = (u8) (LINUX_VERSION_CODE >> 8 & 0x0ff);
-	si.osRevision =     (u8) (LINUX_VERSION_CODE & 0x0ff);
 	si.busType = SI_PCI_BUS;
 	si.processorFamily = DPTI_sig.dsProcessorFamily;
 


^ permalink raw reply	[flat|nested] 4+ messages in thread
* [2.6 patch] drivers/scsi/dpti.h: remove kernel 2.2 #if's
@ 2005-03-27 14:34 Adrian Bunk
  2005-04-02 13:49 ` James Bottomley
  0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2005-03-27 14:34 UTC (permalink / raw)
  To: Andrew Morton; +Cc: James.Bottomley, linux-scsi, linux-kernel

This patch removes #if's for kernel 2.2 .

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch was already sent on:
- 12 Mar 2005

 drivers/scsi/dpti.h |   10 ----------
 1 files changed, 10 deletions(-)

--- linux-2.6.11-mm2-full/drivers/scsi/dpti.h.old	2005-03-12 12:22:23.000000000 +0100
+++ linux-2.6.11-mm2-full/drivers/scsi/dpti.h	2005-03-12 12:22:46.000000000 +0100
@@ -20,15 +20,9 @@
 #ifndef _DPT_H
 #define _DPT_H
 
-#ifndef LINUX_VERSION_CODE
 #include <linux/version.h>
-#endif

-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,00)
-#define MAX_TO_IOP_MESSAGES   (210)
-#else
 #define MAX_TO_IOP_MESSAGES   (255)
-#endif
 #define MAX_FROM_IOP_MESSAGES (255)
 
 
@@ -321,10 +313,6 @@
 static void adpt_delay(int millisec);
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
-static struct pci_dev* adpt_pci_find_device(uint vendor, struct pci_dev* from);
-#endif
-
 #if defined __ia64__ 
 static void adpt_ia64_info(sysInfo_S* si);
 #endif


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-04-17 18:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-15 12:56 [2.6 patch] drivers/scsi/dpt*: remove version.h dependencies Salyzyn, Mark
2005-04-15 12:56 ` Salyzyn, Mark
2005-04-17 18:19 ` Adrian Bunk
  -- strict thread matches above, loose matches on Subject: below --
2005-03-27 14:34 [2.6 patch] drivers/scsi/dpti.h: remove kernel 2.2 #if's Adrian Bunk
2005-04-02 13:49 ` James Bottomley
2005-04-15  0:48   ` [2.6 patch] drivers/scsi/dpt*: remove version.h dependencies Adrian Bunk

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.