git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
scsi
/
pcmcia
/
nsp_cs.h
diff --git
a/drivers/scsi/pcmcia/nsp_cs.h
b/drivers/scsi/pcmcia/nsp_cs.h
index
8908b8e
..
b66b140
100644
(file)
--- a/
drivers/scsi/pcmcia/nsp_cs.h
+++ b/
drivers/scsi/pcmcia/nsp_cs.h
@@
-225,7
+225,7
@@
/*====================================================================*/
typedef struct scsi_info_t {
/*====================================================================*/
typedef struct scsi_info_t {
-
struct pcmcia_device *p_dev
;
+
dev_link_t link
;
struct Scsi_Host *host;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
dev_node_t node;
struct Scsi_Host *host;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,74))
dev_node_t node;
@@
-297,8
+297,8
@@
typedef struct _nsp_hw_data {
/* Card service functions */
static void nsp_cs_detach (struct pcmcia_device *p_dev);
/* Card service functions */
static void nsp_cs_detach (struct pcmcia_device *p_dev);
-static void nsp_cs_release(
struct pcmcia_device
*link);
-static
int nsp_cs_config (struct pcmcia_device
*link);
+static void nsp_cs_release(
dev_link_t
*link);
+static
void nsp_cs_config (dev_link_t
*link);
/* Linux SCSI subsystem specific functions */
static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);
/* Linux SCSI subsystem specific functions */
static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);
@@
-450,7
+450,7
@@
static inline struct Scsi_Host *scsi_host_hn_get(unsigned short hostno)
return host;
}
return host;
}
-static void cs_error(
struct pcmcia_device *
handle, int func, int ret)
+static void cs_error(
client_handle_t
handle, int func, int ret)
{
error_info_t err = { func, ret };
pcmcia_report_error(handle, &err);
{
error_info_t err = { func, ret };
pcmcia_report_error(handle, &err);