[POC][PATCH 39/83] gnttab_end_foreign_access(): switch the last argument to void *

[Al Viro]

From: Al Viro 

Signed-off-by: Al Viro 
---
 drivers/block/xen-blkfront.c  | 12 ++--
 drivers/char/tpm/xen-tpmfront.c   |  2 +-
 drivers/input/misc/xen-kbdfront.c |  4 ++--
 drivers/net/xen-netfront.c|  6 +++---
 drivers/pci/xen-pcifront.c|  2 +-
 drivers/scsi/xen-scsifront.c  |  8 +++-
 drivers/xen/grant-table.c |  6 +++---
 include/xen/grant_table.h |  3 +--
 8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 19b8697..c5873c2 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1094,7 +1094,7 @@ static void blkif_free(struct blkfront_info *info, int 
suspend)
list_del(_gnt->node);
if (persistent_gnt->gref != GRANT_INVALID_REF) {
gnttab_end_foreign_access(persistent_gnt->gref,
- 0, 0UL);
+ 0, NULL);
info->persistent_gnts_c--;
}
if (info->feature_persistent)
@@ -1131,7 +1131,7 @@ static void blkif_free(struct blkfront_info *info, int 
suspend)
   info->shadow[i].req.u.rw.nr_segments;
for (j = 0; j < segs; j++) {
persistent_gnt = info->shadow[i].grants_used[j];
-   gnttab_end_foreign_access(persistent_gnt->gref, 0, 0UL);
+   gnttab_end_foreign_access(persistent_gnt->gref, 0, 
NULL);
if (info->feature_persistent)
__free_page(persistent_gnt->page);
kfree(persistent_gnt);
@@ -1146,7 +1146,7 @@ static void blkif_free(struct blkfront_info *info, int 
suspend)
 
for (j = 0; j < INDIRECT_GREFS(segs); j++) {
persistent_gnt = info->shadow[i].indirect_grants[j];
-   gnttab_end_foreign_access(persistent_gnt->gref, 0, 0UL);
+   gnttab_end_foreign_access(persistent_gnt->gref, 0, 
NULL);
__free_page(persistent_gnt->page);
kfree(persistent_gnt);
}
@@ -1170,7 +1170,7 @@ free_shadow:
/* Free resources associated with old device channel. */
for (i = 0; i < info->nr_ring_pages; i++) {
if (info->ring_ref[i] != GRANT_INVALID_REF) {
-   gnttab_end_foreign_access(info->ring_ref[i], 0, 0);
+   gnttab_end_foreign_access(info->ring_ref[i], 0, NULL);
info->ring_ref[i] = GRANT_INVALID_REF;
}
}
@@ -1261,7 +1261,7 @@ static void blkif_completion(struct blk_shadow *s, struct 
blkfront_info *info,
 * so it will not be picked again unless we run out of
 * persistent grants.
 */
-   gnttab_end_foreign_access(s->grants_used[i]->gref, 0, 
0UL);
+   gnttab_end_foreign_access(s->grants_used[i]->gref, 0, 
NULL);
s->grants_used[i]->gref = GRANT_INVALID_REF;
list_add_tail(>grants_used[i]->node, >grants);
}
@@ -1277,7 +1277,7 @@ static void blkif_completion(struct blk_shadow *s, struct 
blkfront_info *info,
} else {
struct page *indirect_page;
 
-   
gnttab_end_foreign_access(s->indirect_grants[i]->gref, 0, 0UL);
+   
gnttab_end_foreign_access(s->indirect_grants[i]->gref, 0, NULL);
/*
 * Add the used indirect page back to the list 
of
 * available pages for indirect grefs.
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 4ac4830..2ccd0c9 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -273,7 +273,7 @@ static void ring_free(struct tpm_private *priv)
 
if (priv->ring_ref)
gnttab_end_foreign_access(priv->ring_ref, 0,
-   (unsigned long)priv->shr);
+   priv->shr);
else
free_page(priv->shr);
 
diff --git a/drivers/input/misc/xen-kbdfront.c 
b/drivers/input/misc/xen-kbdfront.c
index d70a619..93f3a5c 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -291,7 +291,7 @@ static int xenkbd_connect_backend(struct xenbus_device *dev,
  error_evtchan:
xenbus_free_evtchn(dev, evtchn);
  error_grant:
-   gnttab_end_foreign_access(info->gref, 0, 0UL);
+   gnttab_end_foreign_access(info->gref, 0, NULL);
info->gref = -1;
return ret;
 }
@@ -302,7 +302,7 @@ static void 

[POC][PATCH 39/83] gnttab_end_foreign_access(): switch the last argument to void *

[Al Viro]

From: Al Viro 

Signed-off-by: Al Viro 
---
 drivers/block/xen-blkfront.c  | 12 ++--
 drivers/char/tpm/xen-tpmfront.c   |  2 +-
 drivers/input/misc/xen-kbdfront.c |  4 ++--
 drivers/net/xen-netfront.c|  6 +++---
 drivers/pci/xen-pcifront.c|  2 +-
 drivers/scsi/xen-scsifront.c  |  8 +++-
 drivers/xen/grant-table.c |  6 +++---
 include/xen/grant_table.h |  3 +--
 8 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 19b8697..c5873c2 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1094,7 +1094,7 @@ static void blkif_free(struct blkfront_info *info, int 
suspend)
list_del(_gnt->node);
if (persistent_gnt->gref != GRANT_INVALID_REF) {
gnttab_end_foreign_access(persistent_gnt->gref,
- 0, 0UL);
+ 0, NULL);
info->persistent_gnts_c--;
}
if (info->feature_persistent)
@@ -1131,7 +1131,7 @@ static void blkif_free(struct blkfront_info *info, int 
suspend)
   info->shadow[i].req.u.rw.nr_segments;
for (j = 0; j < segs; j++) {
persistent_gnt = info->shadow[i].grants_used[j];
-   gnttab_end_foreign_access(persistent_gnt->gref, 0, 0UL);
+   gnttab_end_foreign_access(persistent_gnt->gref, 0, 
NULL);
if (info->feature_persistent)
__free_page(persistent_gnt->page);
kfree(persistent_gnt);
@@ -1146,7 +1146,7 @@ static void blkif_free(struct blkfront_info *info, int 
suspend)
 
for (j = 0; j < INDIRECT_GREFS(segs); j++) {
persistent_gnt = info->shadow[i].indirect_grants[j];
-   gnttab_end_foreign_access(persistent_gnt->gref, 0, 0UL);
+   gnttab_end_foreign_access(persistent_gnt->gref, 0, 
NULL);
__free_page(persistent_gnt->page);
kfree(persistent_gnt);
}
@@ -1170,7 +1170,7 @@ free_shadow:
/* Free resources associated with old device channel. */
for (i = 0; i < info->nr_ring_pages; i++) {
if (info->ring_ref[i] != GRANT_INVALID_REF) {
-   gnttab_end_foreign_access(info->ring_ref[i], 0, 0);
+   gnttab_end_foreign_access(info->ring_ref[i], 0, NULL);
info->ring_ref[i] = GRANT_INVALID_REF;
}
}
@@ -1261,7 +1261,7 @@ static void blkif_completion(struct blk_shadow *s, struct 
blkfront_info *info,
 * so it will not be picked again unless we run out of
 * persistent grants.
 */
-   gnttab_end_foreign_access(s->grants_used[i]->gref, 0, 
0UL);
+   gnttab_end_foreign_access(s->grants_used[i]->gref, 0, 
NULL);
s->grants_used[i]->gref = GRANT_INVALID_REF;
list_add_tail(>grants_used[i]->node, >grants);
}
@@ -1277,7 +1277,7 @@ static void blkif_completion(struct blk_shadow *s, struct 
blkfront_info *info,
} else {
struct page *indirect_page;
 
-   
gnttab_end_foreign_access(s->indirect_grants[i]->gref, 0, 0UL);
+   
gnttab_end_foreign_access(s->indirect_grants[i]->gref, 0, NULL);
/*
 * Add the used indirect page back to the list 
of
 * available pages for indirect grefs.
diff --git a/drivers/char/tpm/xen-tpmfront.c b/drivers/char/tpm/xen-tpmfront.c
index 4ac4830..2ccd0c9 100644
--- a/drivers/char/tpm/xen-tpmfront.c
+++ b/drivers/char/tpm/xen-tpmfront.c
@@ -273,7 +273,7 @@ static void ring_free(struct tpm_private *priv)
 
if (priv->ring_ref)
gnttab_end_foreign_access(priv->ring_ref, 0,
-   (unsigned long)priv->shr);
+   priv->shr);
else
free_page(priv->shr);
 
diff --git a/drivers/input/misc/xen-kbdfront.c 
b/drivers/input/misc/xen-kbdfront.c
index d70a619..93f3a5c 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -291,7 +291,7 @@ static int xenkbd_connect_backend(struct xenbus_device *dev,
  error_evtchan:
xenbus_free_evtchn(dev, evtchn);
  error_grant:
-   gnttab_end_foreign_access(info->gref, 0, 0UL);
+   gnttab_end_foreign_access(info->gref, 0, NULL);
info->gref = -1;
return ret;
 }
@@