From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
To: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: Andrew Morton <akpm@osdl.org>,
James Bottomley <James.Bottomley@steeleye.com>,
linux-scsi@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
ipslinux@adaptec.com
Subject: Re: [RFC] [PATCH 6/9] drivers/scsi/ips.h Removal of old scsi code
Date: Sat, 12 Aug 2006 23:02:57 +0200 [thread overview]
Message-ID: <44DE4201.4020703@gmail.com> (raw)
In-Reply-To: <44DE3E5E.3020605@gmail.com>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
diff -uprN -X linux-work/Documentation/dontdiff linux-work-clean/drivers/scsi/ips.h linux-work/drivers/scsi/ips.h
--- linux-work-clean/drivers/scsi/ips.h 2006-03-20 06:53:29.000000000 +0100
+++ linux-work/drivers/scsi/ips.h 2006-08-12 22:02:54.000000000 +0200
@@ -57,9 +57,7 @@
/*
* Some handy macros
*/
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,20) || defined CONFIG_HIGHIO
- #define IPS_HIGHIO
- #endif
+ #define IPS_HIGHIO
#define IPS_HA(x) ((ips_ha_t *) x->hostdata)
#define IPS_COMMAND_ID(ha, scb) (int) (scb - ha->scbs)
@@ -83,11 +81,6 @@
#define IPS_SGLIST_SIZE(ha) (IPS_USE_ENH_SGLIST(ha) ? \
sizeof(IPS_ENH_SG_LIST) : sizeof(IPS_STD_SG_LIST))
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,4)
- #define pci_set_dma_mask(dev,mask) ( mask > 0xffffffff ? 1:0 )
- #define scsi_set_pci_device(sh,dev) (0)
- #endif
-
#ifndef IRQ_NONE
typedef void irqreturn_t;
#define IRQ_NONE
@@ -95,18 +88,6 @@
#define IRQ_RETVAL(x)
#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- #define IPS_REGISTER_HOSTS(SHT) scsi_register_module(MODULE_SCSI_HA,SHT)
- #define IPS_UNREGISTER_HOSTS(SHT) scsi_unregister_module(MODULE_SCSI_HA,SHT)
- #define IPS_ADD_HOST(shost,device)
- #define IPS_REMOVE_HOST(shost)
- #define IPS_SCSI_SET_DEVICE(sh,ha) scsi_set_pci_device(sh, (ha)->pcidev)
- #define IPS_PRINTK(level, pcidev, format, arg...) \
- printk(level "%s %s:" format , "ips" , \
- (pcidev)->slot_name , ## arg)
- #define scsi_host_alloc(sh,size) scsi_register(sh,size)
- #define scsi_host_put(sh) scsi_unregister(sh)
- #else
#define IPS_REGISTER_HOSTS(SHT) (!ips_detect(SHT))
#define IPS_UNREGISTER_HOSTS(SHT)
#define IPS_ADD_HOST(shost,device) do { scsi_add_host(shost,device); scsi_scan_host(shost); } while (0)
@@ -114,7 +95,6 @@
#define IPS_SCSI_SET_DEVICE(sh,ha) do { } while (0)
#define IPS_PRINTK(level, pcidev, format, arg...) \
dev_printk(level , &((pcidev)->dev) , format , ## arg)
- #endif
#ifndef MDELAY
#define MDELAY mdelay
@@ -448,16 +428,10 @@
/*
* Scsi_Host Template
*/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
- static int ips_proc24_info(char *, char **, off_t, int, int, int);
- static void ips_select_queue_depth(struct Scsi_Host *, struct scsi_device *);
- static int ips_biosparam(Disk *disk, kdev_t dev, int geom[]);
-#else
static int ips_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
static int ips_biosparam(struct scsi_device *sdev, struct block_device *bdev,
sector_t capacity, int geom[]);
static int ips_slave_configure(struct scsi_device *SDptr);
-#endif
/*
* Raid Command Formats
next prev parent reply other threads:[~2006-08-12 21:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <44DE3E5E.3020605@gmail.com>
2006-08-12 21:01 ` [RFC] [PATCH 1/9] drivers/scsi/dpt/dpti_i2o.h Removal of old scsi code Michal Piotrowski
2006-08-12 21:02 ` [RFC] [PATCH 2/9] drivers/scsi/gdth.c " Michal Piotrowski
2006-08-12 21:02 ` [RFC] [PATCH 3/9] drivers/scsi/gdth.h " Michal Piotrowski
2006-08-12 21:02 ` [RFC] [PATCH 4/9] drivers/scsi/gdth_proc.c " Michal Piotrowski
2006-08-12 21:02 ` [RFC] [PATCH 5/9] drivers/scsi/ips.c " Michal Piotrowski
2006-08-12 21:02 ` Michal Piotrowski [this message]
2006-08-12 21:03 ` [RFC] [PATCH 7/9] drivers/scsi/nsp32.c " Michal Piotrowski
2006-08-12 21:03 ` [RFC] [PATCH 8/9] drivers/scsi/nsp32.h " Michal Piotrowski
2006-08-12 21:03 ` [RFC] [PATCH 9/9] drivers/scsi/pcmcia/nsp_cs.h " Michal Piotrowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44DE4201.4020703@gmail.com \
--to=michal.k.k.piotrowski@gmail.com \
--cc=James.Bottomley@steeleye.com \
--cc=akpm@osdl.org \
--cc=ipslinux@adaptec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.