2006-08-12 21:02:06

by Michal Piotrowski

[permalink] [raw]
Subject: Re: [RFC] [PATCH 3/9] drivers/scsi/gdth.h Removal of old scsi code

Signed-off-by: Michal Piotrowski <[email protected]>

diff -uprN -X linux-work/Documentation/dontdiff linux-work-clean/drivers/scsi/gdth.h linux-work/drivers/scsi/gdth.h
--- linux-work-clean/drivers/scsi/gdth.h 2006-08-12 01:51:16.000000000 +0200
+++ linux-work/drivers/scsi/gdth.h 2006-08-12 20:49:38.000000000 +0200
@@ -936,18 +936,12 @@ typedef struct {
gdth_binfo_str binfo; /* controller info */
gdth_evt_data dvr; /* event structure */
spinlock_t smp_lock;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
struct pci_dev *pdev;
-#endif
char oem_name[8];
#ifdef GDTH_DMA_STATISTICS
ulong dma32_cnt, dma64_cnt; /* statistics: DMA buffer */
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
struct scsi_device *sdev;
-#else
- struct scsi_device sdev;
-#endif
} gdth_ha_str;

/* structure for scsi_register(), SCSI bus != 0 */
@@ -1029,10 +1023,6 @@ typedef struct {

/* function prototyping */

-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
int gdth_proc_info(struct Scsi_Host *, char *,char **,off_t,int,int);
-#else
-int gdth_proc_info(char *,char **,off_t,int,int,int);
-#endif

#endif