matroxfb: make CONFIG_FB_MATROX_MULTIHEAD=y mandatory

I would like to get rid of option CONFIG_FB_MATROX_MULTIHEAD and just
always enable it.  There are many reasons for doing this:

* CONFIG_FB_MATROX_MULTIHEAD=y is what all x86 distributions do, so it
  definitely works or we would know by now.

* Building the matroxfb driver with CONFIG_FB_MATROX_MULTIHEAD not set
  results in the following build warning:

drivers/video/matrox/matroxfb_crtc2.c: In function 'matroxfb_dh_open':
drivers/video/matrox/matroxfb_crtc2.c:265: warning: the address of 'matroxfb_global_mxinfo' will always evaluate as 'true'
drivers/video/matrox/matroxfb_crtc2.c: In function 'matroxfb_dh_release':
drivers/video/matrox/matroxfb_crtc2.c:285: warning: the address of 'matroxfb_global_mxinfo' will always evaluate as 'true'

This is nothing to be worried about, the driver will work fine, but build
warnings are still annoying.

* The trick to get multihead support without CONFIG_FB_MATROX_MULTIHEAD,
  which is described in the config help text, no longer works: you can't
  load the same kernel module more than once.

* I fail to see how CONFIG_FB_MATROX_MULTIHEAD=y would make the code
  significantly slower, contrary to what the help text says.  A few extra
  parameters on the stack here and there can't really slow things down in
  comaprison to the rest of the code, and register access.

* The driver built without CONFIG_FB_MATROX_MULTIHEAD is larger than the
  driver build with CONFIG_FB_MATROX_MULTIHEAD=y by 8%.

* One less configuration option makes things simpler.  We add options
  all the time, being able to remove one for once is nice.  It improves
  testing coverage.  And I don't think the Matrox adapters are still
  popular enough to warrant overdetailed configuration settings.

* We should be able to unobfuscate the driver code quite a bit after
  this change (patches follow.)

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 0 insertions, 20 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7be506262284..9bbb2855ea91 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1275,26 +1275,6 @@ config FB_MATROX_MAVEN
           painting procedures (the secondary head does not use acceleration
           engine).
 
-config FB_MATROX_MULTIHEAD
-        bool "Multihead support"
-        depends on FB_MATROX
-        ---help---
-          Say Y here if you have more than one (supported) Matrox device in
-          your computer and you want to use all of them for different monitors
-          ("multihead"). If you have only one device, you should say N because
-          the driver compiled with Y is larger and a bit slower, especially on
-          ia32 (ix86).
-
-          If you said M to "Matrox unified accelerated driver" and N here, you
-          will still be able to use several Matrox devices simultaneously:
-          insert several instances of the module matroxfb into the kernel
-          with insmod, supplying the parameter "dev=N" where N is 0, 1, etc.
-          for the different Matrox devices. This method is slightly faster but
-          uses 40 KB of kernel memory per Matrox card.
-
-          There is no need for enabling 'Matrox multihead support' if you have
-          only one Matrox card in the box.
-
 config FB_RADEON
         tristate "ATI Radeon display support"
         depends on FB && PCI