From 21da56505b1f14a9664a32b08b0b63157e0803e1 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Tue, 5 Jan 2010 17:56:03 -0800
Subject: [PATCH] --- yaml --- r: 183088 b: refs/heads/master c:
 361b7b5b032338361ea88412f1fc45479fdd5859 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/input/gameport/gameport.c | 6 +-----
 trunk/include/linux/gameport.h          | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3429fd7b732d..462e312ab635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cac9169bf75ea8cbaab75be9dbe5eb79a2bad6f5
+refs/heads/master: 361b7b5b032338361ea88412f1fc45479fdd5859
diff --git a/trunk/drivers/input/gameport/gameport.c b/trunk/drivers/input/gameport/gameport.c
index ac11be08585e..f9e5f8e1690b 100644
--- a/trunk/drivers/input/gameport/gameport.c
+++ b/trunk/drivers/input/gameport/gameport.c
@@ -561,8 +561,6 @@ static void gameport_add_port(struct gameport *gameport)
 		printk(KERN_ERR
 			"gameport: device_add() failed for %s (%s), error: %d\n",
 			gameport->phys, gameport->name, error);
-	else
-		gameport->registered = 1;
 }
 
 /*
@@ -584,10 +582,8 @@ static void gameport_destroy_port(struct gameport *gameport)
 		gameport->parent = NULL;
 	}
 
-	if (gameport->registered) {
+	if (device_is_registered(&gameport->dev))
 		device_del(&gameport->dev);
-		gameport->registered = 0;
-	}
 
 	list_del_init(&gameport->node);
 
diff --git a/trunk/include/linux/gameport.h b/trunk/include/linux/gameport.h
index 1bc08541c2b9..48e68da097f6 100644
--- a/trunk/include/linux/gameport.h
+++ b/trunk/include/linux/gameport.h
@@ -46,7 +46,6 @@ struct gameport {
 	struct mutex drv_mutex;		/* protects serio->drv so attributes can pin driver */
 
 	struct device dev;
-	unsigned int registered;	/* port has been fully registered with driver core */
 
 	struct list_head node;
 };