From 7fd8538fc967b50249a715a1dfded9bb264086da Mon Sep 17 00:00:00 2001
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Fri, 12 Oct 2012 10:22:25 +0200
Subject: [PATCH] --- yaml --- r: 334736 b: refs/heads/master c:
 aa92b33c6b93b5ef4ccbaa72afa9c387a96c2ee2 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/s390/cio/idset.c | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index d62fe0eb30c4..77e7b5ef9f11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e860696e050375ae7fbb06984c19e2bf6a322e0
+refs/heads/master: aa92b33c6b93b5ef4ccbaa72afa9c387a96c2ee2
diff --git a/trunk/drivers/s390/cio/idset.c b/trunk/drivers/s390/cio/idset.c
index e6d5f8c49524..f0973a04ec49 100644
--- a/trunk/drivers/s390/cio/idset.c
+++ b/trunk/drivers/s390/cio/idset.c
@@ -1,9 +1,10 @@
 /*
- *    Copyright IBM Corp. 2007
+ *    Copyright IBM Corp. 2007, 2012
  *    Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
  */
 
 #include <linux/vmalloc.h>
+#include <linux/bitmap.h>
 #include <linux/bitops.h>
 #include "idset.h"
 #include "css.h"
@@ -111,20 +112,13 @@ int idset_sch_get_first(struct idset *set, struct subchannel_id *schid)
 
 int idset_is_empty(struct idset *set)
 {
-	int bitnum;
-
-	bitnum = find_first_bit(set->bitmap, set->num_ssid * set->num_id);
-	if (bitnum >= set->num_ssid * set->num_id)
-		return 1;
-	return 0;
+	return bitmap_empty(set->bitmap, set->num_ssid * set->num_id);
 }
 
 void idset_add_set(struct idset *to, struct idset *from)
 {
-	unsigned long i, len;
+	int len = min(__BITOPS_WORDS(to->num_ssid * to->num_id),
+		      __BITOPS_WORDS(from->num_ssid * from->num_id));
 
-	len = min(__BITOPS_WORDS(to->num_ssid * to->num_id),
-		  __BITOPS_WORDS(from->num_ssid * from->num_id));
-	for (i = 0; i < len ; i++)
-		to->bitmap[i] |= from->bitmap[i];
+	bitmap_or(to->bitmap, to->bitmap, from->bitmap, len);
 }