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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
scsi
/
arm
/
scsi.h
diff --git
a/drivers/scsi/arm/scsi.h
b/drivers/scsi/arm/scsi.h
index
48e1c4d
..
6dd544a
100644
(file)
--- a/
drivers/scsi/arm/scsi.h
+++ b/
drivers/scsi/arm/scsi.h
@@
-10,21
+10,21
@@
* Commonly used scsi driver functions.
*/
* Commonly used scsi driver functions.
*/
+#include <linux/scatterlist.h>
+
#define BELT_AND_BRACES
/*
* The scatter-gather list handling. This contains all
* the yucky stuff that needs to be fixed properly.
*/
#define BELT_AND_BRACES
/*
* The scatter-gather list handling. This contains all
* the yucky stuff that needs to be fixed properly.
*/
-static inline int copy_SCp_to_sg(struct scatterlist *sg,
Scsi_P
ointer *SCp, int max)
+static inline int copy_SCp_to_sg(struct scatterlist *sg,
struct scsi_p
ointer *SCp, int max)
{
int bufs = SCp->buffers_residual;
BUG_ON(bufs + 1 > max);
{
int bufs = SCp->buffers_residual;
BUG_ON(bufs + 1 > max);
- sg->page = virt_to_page(SCp->ptr);
- sg->offset = offset_in_page(SCp->ptr);
- sg->length = SCp->this_residual;
+ sg_set_buf(sg, SCp->ptr, SCp->this_residual);
if (bufs)
memcpy(sg + 1, SCp->buffer + 1,
if (bufs)
memcpy(sg + 1, SCp->buffer + 1,
@@
-32,7
+32,7
@@
static inline int copy_SCp_to_sg(struct scatterlist *sg, Scsi_Pointer *SCp, int
return bufs + 1;
}
return bufs + 1;
}
-static inline int next_SCp(
Scsi_P
ointer *SCp)
+static inline int next_SCp(
struct scsi_p
ointer *SCp)
{
int ret = SCp->buffers_residual;
if (ret) {
{
int ret = SCp->buffers_residual;
if (ret) {
@@
-49,7
+49,7
@@
static inline int next_SCp(Scsi_Pointer *SCp)
return ret;
}
return ret;
}
-static inline unsigned char get_next_SCp_byte(
Scsi_P
ointer *SCp)
+static inline unsigned char get_next_SCp_byte(
struct scsi_p
ointer *SCp)
{
char c = *SCp->ptr;
{
char c = *SCp->ptr;
@@
-59,7
+59,7
@@
static inline unsigned char get_next_SCp_byte(Scsi_Pointer *SCp)
return c;
}
return c;
}
-static inline void put_next_SCp_byte(
Scsi_P
ointer *SCp, unsigned char c)
+static inline void put_next_SCp_byte(
struct scsi_p
ointer *SCp, unsigned char c)
{
*SCp->ptr = c;
SCp->ptr += 1;
{
*SCp->ptr = c;
SCp->ptr += 1;