drivers/xen: switch to ->close()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

drivers/xen/gntdev.c

diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 3c8803f..a0a8dc7 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -527,9 +527,9 @@
 	return 0;
 }
 
-static int gntdev_release(struct inode *inode, struct file *flip)
+static void gntdev_close(struct file *file)
 {
-	struct gntdev_priv *priv = flip->private_data;
+	struct gntdev_priv *priv = file->private_data;
 	struct grant_map *map;
 
 	pr_debug("priv %p\n", priv);
@@ -544,7 +544,6 @@
 	if (use_ptemod)
 		mmu_notifier_unregister(&priv->mn, priv->mm);
 	kfree(priv);
-	return 0;
 }
 
 static long gntdev_ioctl_map_grant_ref(struct gntdev_priv *priv,
@@ -831,7 +830,7 @@
 static const struct file_operations gntdev_fops = {
 	.owner = THIS_MODULE,
 	.open = gntdev_open,
-	.release = gntdev_release,
+	.close = gntdev_close,
 	.mmap = gntdev_mmap,
 	.unlocked_ioctl = gntdev_ioctl
 };

drivers/xen/mcelog.c

diff --git a/drivers/xen/mcelog.c b/drivers/xen/mcelog.c
index 8feee08..f6d4a5f 100644
--- a/drivers/xen/mcelog.c
+++ b/drivers/xen/mcelog.c
@@ -91,7 +91,7 @@
 	return nonseekable_open(inode, file);
 }
 
-static int xen_mce_chrdev_release(struct inode *inode, struct file *file)
+static void xen_mce_chrdev_close(struct file *file)
 {
 	spin_lock(&xen_mce_chrdev_state_lock);
 
@@ -99,8 +99,6 @@
 	xen_mce_chrdev_open_exclu = 0;
 
 	spin_unlock(&xen_mce_chrdev_state_lock);
-
-	return 0;
 }
 
 static ssize_t xen_mce_chrdev_read(struct file *filp, char __user *ubuf,
@@ -178,7 +176,7 @@
 
 static const struct file_operations xen_mce_chrdev_ops = {
 	.open			= xen_mce_chrdev_open,
-	.release		= xen_mce_chrdev_release,
+	.close			= xen_mce_chrdev_close,
 	.read			= xen_mce_chrdev_read,
 	.poll			= xen_mce_chrdev_poll,
 	.unlocked_ioctl		= xen_mce_chrdev_ioctl,

drivers/xen/xenbus/xenbus_dev_frontend.c

diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index ac72702..1e8a45f 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -548,9 +548,9 @@
 	return 0;
 }
 
-static int xenbus_file_release(struct inode *inode, struct file *filp)
+static void xenbus_file_close(struct file *file)
 {
-	struct xenbus_file_priv *u = filp->private_data;
+	struct xenbus_file_priv *u = file->private_data;
 	struct xenbus_transaction_holder *trans, *tmp;
 	struct watch_adapter *watch, *tmp_watch;
 	struct read_buffer *rb, *tmp_rb;
@@ -577,8 +577,6 @@
 		kfree(rb);
 	}
 	kfree(u);
-
-	return 0;
 }
 
 static unsigned int xenbus_file_poll(struct file *file, poll_table *wait)
@@ -595,7 +593,7 @@
 	.read = xenbus_file_read,
 	.write = xenbus_file_write,
 	.open = xenbus_file_open,
-	.release = xenbus_file_release,
+	.close = xenbus_file_close,
 	.poll = xenbus_file_poll,
 	.llseek = no_llseek,
 };

drivers/xen/xenfs/xenstored.c

diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
index fef20db..7229b76 100644
--- a/drivers/xen/xenfs/xenstored.c
+++ b/drivers/xen/xenfs/xenstored.c
@@ -15,12 +15,6 @@
 	return simple_read_from_buffer(buf, size, off, str, strlen(str));
 }
 
-static int xsd_release(struct inode *inode, struct file *file)
-{
-	kfree(file->private_data);
-	return 0;
-}
-
 static int xsd_kva_open(struct inode *inode, struct file *file)
 {
 	file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
@@ -49,7 +43,7 @@
 	.open = xsd_kva_open,
 	.mmap = xsd_kva_mmap,
 	.read = xsd_read,
-	.release = xsd_release,
+	.close = simple_close_kfree,
 };
 
 static int xsd_port_open(struct inode *inode, struct file *file)
@@ -64,5 +58,5 @@
 const struct file_operations xsd_port_file_ops = {
 	.open = xsd_port_open,
 	.read = xsd_read,
-	.release = xsd_release,
+	.close = simple_close_kfree,
 };