Fix two hlint warnings

Sorry, I broke lint again :), by introducing two sub-standard changes.

Additionally, this silences an older existing warning that only
triggers with some versions of hlint (e.g. 1.8.28 which is present in
Wheezy).

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>

htest/Test/Ganeti/Luxi.hs

@@ -48,6 +48,8 @@ import Test.Ganeti.OpCodes ()
 import Ganeti.BasicTypes
 import qualified Ganeti.Luxi as Luxi
 
+{-# ANN module "HLint: ignore Use camelCase" #-}
+
 -- * Luxi tests
 
 $(genArbitrary ''Luxi.LuxiReq)

htools/Ganeti/HTools/CLI.hs

@@ -336,7 +336,7 @@ genOLuxiSocket defSocket =
    OptComplFile)
 
 oLuxiSocket :: IO OptType
-oLuxiSocket = Path.defaultLuxiSocket >>= (return . genOLuxiSocket)
+oLuxiSocket = liftM genOLuxiSocket Path.defaultLuxiSocket
 
 oMachineReadable :: OptType
 oMachineReadable =

htools/Ganeti/Ssconf.hs

@@ -86,7 +86,7 @@ $(declareSADT "SSKey"
 keyToFilename :: FilePath     -- ^ Config path root
               -> SSKey        -- ^ Ssconf key
               -> FilePath     -- ^ Full file name
-keyToFilename cfgpath key = do
+keyToFilename cfgpath key =
   cfgpath </> sSFilePrefix ++ sSKeyToRaw key
 
 -- | Runs an IO action while transforming any error into 'Bad'