Staging: hv: Replace typedef SG_BUFFER_LIST by struct scatterlist
typedef SG_BUFFER_LIST is removed and its uses are replaced by the use of
struct scatterlist.
Signed-off-by: Nicolas Palix <npalix@diku.dk>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index be9770e..2938e58 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -773,7 +773,7 @@
VMPACKET_DESCRIPTOR desc;
u32 packetLen = sizeof(VMPACKET_DESCRIPTOR) + BufferLen;
u32 packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
- SG_BUFFER_LIST bufferList[3];
+ struct scatterlist bufferList[3];
u64 alignedData=0;
DPRINT_ENTER(VMBUS);
@@ -790,14 +790,10 @@
desc.Length8 = (u16)(packetLenAligned >> 3);
desc.TransactionId = RequestId;
- bufferList[0].Data = &desc;
- bufferList[0].Length = sizeof(VMPACKET_DESCRIPTOR);
-
- bufferList[1].Data = Buffer;
- bufferList[1].Length = BufferLen;
-
- bufferList[2].Data = &alignedData;
- bufferList[2].Length = packetLenAligned - packetLen;
+ sg_init_table(bufferList,3);
+ sg_set_buf(&bufferList[0], &desc, sizeof(VMPACKET_DESCRIPTOR));
+ sg_set_buf(&bufferList[1], Buffer, BufferLen);
+ sg_set_buf(&bufferList[2], &alignedData, packetLenAligned - packetLen);
ret = RingBufferWrite(
&Channel->Outbound,
@@ -841,7 +837,7 @@
u32 descSize;
u32 packetLen;
u32 packetLenAligned;
- SG_BUFFER_LIST bufferList[3];
+ struct scatterlist bufferList[3];
u64 alignedData=0;
DPRINT_ENTER(VMBUS);
@@ -872,14 +868,10 @@
desc.Range[i].Pfn = PageBuffers[i].Pfn;
}
- bufferList[0].Data = &desc;
- bufferList[0].Length = descSize;
-
- bufferList[1].Data = Buffer;
- bufferList[1].Length = BufferLen;
-
- bufferList[2].Data = &alignedData;
- bufferList[2].Length = packetLenAligned - packetLen;
+ sg_init_table(bufferList,3);
+ sg_set_buf(&bufferList[0], &desc, descSize);
+ sg_set_buf(&bufferList[1], Buffer, BufferLen);
+ sg_set_buf(&bufferList[2], &alignedData, packetLenAligned - packetLen);
ret = RingBufferWrite(
&Channel->Outbound,
@@ -922,7 +914,7 @@
u32 descSize;
u32 packetLen;
u32 packetLenAligned;
- SG_BUFFER_LIST bufferList[3];
+ struct scatterlist bufferList[3];
u64 alignedData=0;
u32 PfnCount = NUM_PAGES_SPANNED(MultiPageBuffer->Offset, MultiPageBuffer->Length);
@@ -955,14 +947,10 @@
memcpy(desc.Range.PfnArray, MultiPageBuffer->PfnArray, PfnCount*sizeof(u64));
- bufferList[0].Data = &desc;
- bufferList[0].Length = descSize;
-
- bufferList[1].Data = Buffer;
- bufferList[1].Length = BufferLen;
-
- bufferList[2].Data = &alignedData;
- bufferList[2].Length = packetLenAligned - packetLen;
+ sg_init_table(bufferList,3);
+ sg_set_buf(&bufferList[0], &desc, descSize);
+ sg_set_buf(&bufferList[1], Buffer, BufferLen);
+ sg_set_buf(&bufferList[2], &alignedData, packetLenAligned - packetLen);
ret = RingBufferWrite(
&Channel->Outbound,