commit 85a2a365216e8e4eccf826e7dcc06c6298ab5fc1
author Ben Skeggs <bskeggs@redhat.com> Tue Sep 13 05:32:43 2011 +1000
committer Ben Skeggs <bskeggs@redhat.com> Wed Dec 21 19:01:12 2011 +1000
tree b79dd73f4e5197d4fd679b89e63152a578416d34
parent 3f8e11e4b606a050007cd1020d59e7b74c68d088

drm/nouveau/gpio: remove invert flag, use state[] everywhere

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

drivers/gpu/drm/nouveau/nv10_gpio.c

diff --git a/drivers/gpu/drm/nouveau/nv10_gpio.c b/drivers/gpu/drm/nouveau/nv10_gpio.c
index 007fc29..748c9f7 100644
--- a/drivers/gpu/drm/nouveau/nv10_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv10_gpio.c
@@ -68,7 +68,7 @@
 
 	value = NVReadCRTC(dev, 0, reg) >> shift;
 
-	return (ent->invert ? 1 : 0) ^ (value & 1);
+	return (value & 1) == ent->state[1];
 }
 
 int
@@ -83,7 +83,7 @@
 	if (!get_gpio_location(ent, &reg, &shift, &mask))
 		return -ENODEV;
 
-	value = ((ent->invert ? 1 : 0) ^ (state ? 1 : 0)) << shift;
+	value = ent->state[state & 1] << shift;
 	mask = ~(mask << shift);
 
 	NVWriteCRTC(dev, 0, reg, value | (NVReadCRTC(dev, 0, reg) & mask));