The patch titled
drivers/scsi/pcmcia/nsp_cs.h: removal of old scsi code
has been added to the -mm tree. Its filename is
drivers-scsi-pcmcia-nsp_csh-removal-of-old.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: drivers/scsi/pcmcia/nsp_cs.h: removal of old scsi code
From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/pcmcia/nsp_cs.h | 66 ---------------------------------
1 files changed, 66 deletions(-)
diff -puN drivers/scsi/pcmcia/nsp_cs.h~drivers-scsi-pcmcia-nsp_csh-removal-of-old drivers/scsi/pcmcia/nsp_cs.h
--- a/drivers/scsi/pcmcia/nsp_cs.h~drivers-scsi-pcmcia-nsp_csh-removal-of-old
+++ a/drivers/scsi/pcmcia/nsp_cs.h
@@ -290,7 +290,6 @@ typedef struct _nsp_hw_data {
#endif
} nsp_hw_data;
-
/****************************************************************************
*
*/
@@ -302,22 +301,13 @@ static int nsp_cs_config (struct
/* Linux SCSI subsystem specific functions */
static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int nsp_detect_old (struct scsi_host_template *sht);
-static int nsp_release_old(struct Scsi_Host *shpnt);
-#endif
static const char *nsp_info (struct Scsi_Host *shpnt);
static int nsp_proc_info (
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
struct Scsi_Host *host,
-#endif
char *buffer,
char **start,
off_t offset,
int length,
-#if !(LINUX_VERSION_CODE > KERNEL_VERSION(2,5,73))
- int hostno,
-#endif
int inout);
static int nsp_queuecommand(Scsi_Cmnd *SCpnt, void (* done)(Scsi_Cmnd *SCpnt));
@@ -352,7 +342,6 @@ static struct Scsi_Host *nsp_detect(stru
static int __init nsp_cs_init(void);
static void __exit nsp_cs_exit(void);
-
/* Debug */
#ifdef NSP_DEBUG
static void show_command (Scsi_Cmnd *SCpnt);
@@ -397,7 +386,6 @@ enum _burst_mode {
BURST_MEM32 = 2,
};
-
/**************************************************************************
* SCSI messaage
*/
@@ -409,62 +397,8 @@ enum _burst_mode {
#define MSG_EXT_SDTR 0x01
-
-/**************************************************************************
- * Compatibility functions
- */
-
-/* for Kernel 2.4 */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
-# define scsi_register_host(template) scsi_register_module(MODULE_SCSI_HA, template)
-# define scsi_unregister_host(template) scsi_unregister_module(MODULE_SCSI_HA, template)
-# define scsi_host_put(host) scsi_unregister(host)
-
-typedef void irqreturn_t;
-# define IRQ_NONE /* */
-# define IRQ_HANDLED /* */
-# define IRQ_RETVAL(x) /* */
-
-/* This is ad-hoc version of scsi_host_get_next() */
-static inline struct Scsi_Host *scsi_host_get_next(struct Scsi_Host *host)
-{
- if (host == NULL) {
- return scsi_hostlist;
- } else {
- return host->next;
- }
-}
-
-/* This is ad-hoc version of scsi_host_hn_get() */
-static inline struct Scsi_Host *scsi_host_hn_get(unsigned short hostno)
-{
- struct Scsi_Host *host;
-
- for (host = scsi_host_get_next(NULL); host != NULL;
- host = scsi_host_get_next(host)) {
- if (host->host_no == hostno) {
- break;
- }
- }
-
- return host;
-}
-
-static void cs_error(struct pcmcia_device *handle, int func, int ret)
-{
- error_info_t err = { func, ret };
- pcmcia_report_error(handle, &err);
-}
-
-/* scatter-gather table */
-# define BUFFER_ADDR (SCpnt->SCp.buffer->address)
-#endif
-
-/* for Kernel 2.6 */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
/* scatter-gather table */
# define BUFFER_ADDR ((char *)((unsigned int)(SCpnt->SCp.buffer->page) + SCpnt->SCp.buffer->offset))
-#endif
#endif /*__nsp_cs__*/
/* end */
_
Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
drivers-scsi-dpt-dpti_i2oh-removal-of-old.patch
drivers-scsi-gdthh-removal-of-old-scsi-code.patch
drivers-scsi-nsp32h-removal-of-old-scsi-code.patch
drivers-scsi-pcmcia-nsp_csh-removal-of-old.patch
csa-basic-accounting-over-taskstats-fix.patch
drivers-video-sis-init301h-removal-of-old.patch
drivers-video-sis-initextlfbc-removal-of.patch
drivers-video-sis-inith-removal-of-old-code.patch
drivers-video-sis-osdefh-removal-of-old-code.patch
drivers-video-sis-sis_accelc-removal-of-old.patch
drivers-video-sis-sis_accelh-removal-of-old.patch
drivers-video-sis-sis_mainc-removal-of-old.patch
drivers-video-sis-vgatypesh-removal-of-old.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
kill-include-linux-configh.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
