[Openchrome-devel] xf86-video-openchrome: 3 commits - configure.ac src/via_driver.c

[Kevin Brace]

 configure.ac     |    2 +-
 src/via_driver.c |   13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 4bd4486873fc088d7cb62afeb55a0eb605b093fb
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 10:21:29 2016 -0700

    Version bumped to 0.4.104
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/configure.ac b/configure.ac
index c96f591..2cef447 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-openchrome],
-        [0.4.103],
+        [0.4.104],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
         [xf86-video-openchrome])
 
commit b1985c879d2d92fe80de8fb3198574474b22ed96
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 10:18:22 2016 -0700

    Changing VIAPreInit to viaPreInit
    
    This way of defining the function name is suggested by X.org X server
    coding style as of 2013. It is part of the code cleanup work being
    conducted to make the code more maintainable. This function is
    located inside via_driver.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index 6a16cc7..ddffd7d 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -79,7 +79,7 @@ static Bool VIAProbe(DriverPtr drv, int flags);
 #endif
 
 static Bool VIASetupDefaultOptions(ScrnInfoPtr pScrn);
-static Bool VIAPreInit(ScrnInfoPtr pScrn, int flags);
+static Bool viaPreInit(ScrnInfoPtr pScrn, int flags);
 static Bool VIAScreenInit(SCREEN_INIT_ARGS_DECL);
 static const OptionInfoRec *VIAAvailableOptions(int chipid, int busid);
 
@@ -470,7 +470,7 @@ via_pci_probe(DriverPtr driver, int entity_num,
 
         entity = xf86GetEntityInfo(entity_num);
 
-        scrn->PreInit = VIAPreInit;
+        scrn->PreInit = viaPreInit;
         scrn->ScreenInit = VIAScreenInit;
         scrn->SwitchMode = VIASwitchMode;
         scrn->AdjustFrame = VIAAdjustFrame;
@@ -542,7 +542,7 @@ VIAProbe(DriverPtr drv, int flags)
 				pScrn->driverName = DRIVER_NAME;
 				pScrn->name = "CHROME";
 				pScrn->Probe = VIAProbe;
-				pScrn->PreInit = VIAPreInit;
+				pScrn->PreInit = viaPreInit;
 				pScrn->ScreenInit = VIAScreenInit;
 				pScrn->SwitchMode = VIASwitchMode;
 				pScrn->AdjustFrame = VIAAdjustFrame;
@@ -889,7 +889,7 @@ xf86CrtcConfigFuncsRec via_xf86crtc_config_funcs = {
 };
 
 static Bool
-VIAPreInit(ScrnInfoPtr pScrn, int flags)
+viaPreInit(ScrnInfoPtr pScrn, int flags)
 {
     XF86OptionPtr option = xf86NewOption("MigrationHeuristic", "greedy");
     EntityInfoPtr pEnt;
@@ -902,7 +902,7 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
     drmVersionPtr drmVer;
 #endif
 
-    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAPreInit\n"));
+    DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaPreInit\n"));
 
     if (pScrn->numEntities > 1)
         return FALSE;
commit bfe0a1da5c934f90e2d129e7fd69270f970be844
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Tue Apr 12 10:16:55 2016 -0700

    Removed a log message from VIAPreInit
    
    This function is located inside via_driver.c.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/src/via_driver.c b/src/via_driver.c
index d1271f6..6a16cc7 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1458,9 +1458,6 @@ VIAPreInit(ScrnInfoPtr pScrn, int flags)
                pVia->I2CScan ? "" : "not ");
 #endif /* HAVE_DEBUG */
 
-    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-               "...Finished parsing config file options.\n");
-
     /* Checking for OLPC XO-1.5. */
     if ((pVia->Chipset == VIA_VX855) &&
         (SUBVENDOR_ID(pVia->PciInfo) == 0x152D) &&