]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
staging/xgifb: Remove uneccessary/simply if in XGINew_GetXG20DRAMType
authorPeter Huewe <peterhuewe@gmx.de>
Mon, 13 May 2013 21:41:45 +0000 (23:41 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 May 2013 23:02:33 +0000 (16:02 -0700)
Instead of storing the value in a temp variable, anding it with 1 and
assign data conditionally we can assign the value directly.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/vb_init.c

index 19ce5a978cae732817745befba348b26cb99c490..9caf12a721dfb0a821c2a579c81d1d65fdfbbf09 100644 (file)
@@ -54,14 +54,12 @@ XGINew_GetXG20DRAMType(struct xgi_hw_device_info *HwDeviceExtension,
                udelay(800);
                xgifb_reg_or(pVBInfo->P3d4, 0x4A, 0x80); /* Enable GPIOH read */
                /* GPIOF 0:DVI 1:DVO */
-               temp = xgifb_reg_get(pVBInfo->P3d4, 0x48);
+               data = xgifb_reg_get(pVBInfo->P3d4, 0x48);
                /* HOTPLUG_SUPPORT */
                /* for current XG20 & XG21, GPIOH is floating, driver will
                 * fix DDR temporarily */
-               if (temp & 0x01) /* DVI read GPIOH */
-                       data = 1; /* DDRII */
-               else
-                       data = 0; /* DDR */
+               /* DVI read GPIOH */
+               data &= 0x01; /* 1=DDRII, 0=DDR */
                /* ~HOTPLUG_SUPPORT */
                xgifb_reg_or(pVBInfo->P3d4, 0xB4, 0x02);
                return data;