From c706c9321eaf9c4dd6c462428708759dbf5a1cc4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Thu, 25 Aug 2011 15:22:34 +0200
Subject: Remove unused variables

* vm/memory_object_proxy.c (memory_object_create_proxy): Remove unused
`kr' variable.
* linux/dev/glue/block.c (free_buffer): Remove unused `i' variable.
(register_blkdev): Remove unused `err' variable.
(unregister_blkdev): Likewise.
(bread): Likewise.
(init_partition): Likewise.
* linux/dev/glue/net.c (device_write): Likewise.
---
 linux/dev/glue/block.c | 8 +-------
 linux/dev/glue/net.c   | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'linux')

diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c
index b920fb6..cec9687 100644
--- a/linux/dev/glue/block.c
+++ b/linux/dev/glue/block.c
@@ -230,8 +230,6 @@ int
 register_blkdev (unsigned major, const char *name,
 		 struct file_operations *fops)
 {
-  int err = 0;
-
   if (major == 0)
     {
       for (major = MAX_BLKDEV - 1; major > 0; major--)
@@ -260,8 +258,6 @@ out:
 int
 unregister_blkdev (unsigned major, const char *name)
 {
-  int err;
-
   if (major >= MAX_BLKDEV)
     return -LINUX_EINVAL;
   if (! blkdevs[major].fops || strcmp (blkdevs[major].name, name))
@@ -324,7 +320,6 @@ alloc_buffer (int size)
 static void
 free_buffer (void *p, int size)
 {
-  int i;
   struct temp_data *d;
   vm_page_t m;
 
@@ -388,7 +383,6 @@ __brelse (struct buffer_head *bh)
 struct buffer_head *
 bread (kdev_t dev, int block, int size)
 {
-  int err;
   struct buffer_head *bh;
 
   bh = getblk (dev, block, size);
@@ -922,7 +916,7 @@ static kern_return_t
 init_partition (struct name_map *np, kdev_t *dev,
 		struct device_struct *ds, int slice, int *part)
 {
-  int err, i, j;
+  int i, j;
   struct disklabel *lp;
   struct gendisk *gd = ds->gd;
   struct partition *p;
diff --git a/linux/dev/glue/net.c b/linux/dev/glue/net.c
index 095428d..acb31ae 100644
--- a/linux/dev/glue/net.c
+++ b/linux/dev/glue/net.c
@@ -425,7 +425,6 @@ device_write (void *d, ipc_port_t reply_port,
 {
   unsigned char *p;
   int i, amt, skblen, s;
-  io_return_t err = 0;
   vm_map_copy_t copy = (vm_map_copy_t) data;
   struct net_data *nd = d;
   struct linux_device *dev = nd->dev;
-- 
cgit v1.2.3