- w1-remove-unused-and-confusing-variable.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     w1: remove unused and confusing variable.
has been removed from the -mm tree.  Its filename was
     w1-remove-unused-and-confusing-variable.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: w1: remove unused and confusing variable.
From: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>

Remvoe variable which actually is not used (except assigning it a value)
and confusing break out of the family checking loop.  Found by Harry Mason.

Signed-off-by: Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
Cc: Harry J Mason <hjm03r@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 drivers/w1/w1.c |    4 ----
 1 file changed, 4 deletions(-)

diff -puN drivers/w1/w1.c~w1-remove-unused-and-confusing-variable drivers/w1/w1.c
--- a/drivers/w1/w1.c~w1-remove-unused-and-confusing-variable
+++ a/drivers/w1/w1.c
@@ -675,7 +675,6 @@ static void w1_slave_found(void *data, u
 	struct w1_slave *sl;
 	struct list_head *ent;
 	struct w1_reg_num *tmp;
-	int family_found = 0;
 	struct w1_master *dev;
 	u64 rn_le = cpu_to_le64(rn);
 
@@ -698,9 +697,6 @@ static void w1_slave_found(void *data, u
 		    sl->reg_num.crc == tmp->crc) {
 			set_bit(W1_SLAVE_ACTIVE, (long *)&sl->flags);
 			break;
-		} else if (sl->reg_num.family == tmp->family) {
-			family_found = 1;
-			break;
 		}
 
 		slave_count++;
_

Patches currently in -mm which might be from johnpol@xxxxxxxxxxx are

origin.patch
ds1wm-decouple-host-irq-and-intr-active-state-settings.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux