V4L/DVB (7314): pvrusb2: Make device attribute structure more compact

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/pvrusb2/pvrusb2-devattr.h b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
index ce4004978a927c0469a685acf10b0f20a053ff44..fb5f5d17e8cb72b9638611890044b762d92ad1d6 100644 (file)
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.h
@@ -65,52 +65,52 @@ struct pvr2_device_desc {
           was initialized from internal ROM. */
        struct pvr2_string_table fx2_firmware;
 
+       /* Initial standard bits to use for this device, if not zero.
+          Anything set here is also implied as an available standard.
+          Note: This is ignored if overridden on the module load line via
+          the video_std module option. */
+       v4l2_std_id default_std_mask;
+
+       /* V4L tuner type ID to use with this device (only used if the
+          driver could not discover the type any other way). */
+       int default_tuner_type;
+
        /* Signal routing scheme used by device, contains one of
           PVR2_ROUTING_SCHEME_XXX.  Schemes have to be defined as we
           encounter them.  This is an arbitrary integer scheme id; its
           meaning is contained entirely within the driver and is
           interpreted by logic which must send commands to the chip-level
           drivers (search for things which touch this field). */
-       unsigned int signal_routing_scheme;
+       unsigned char signal_routing_scheme;
 
        /* Indicates scheme for controlling device's LED (if any).  The
           driver will turn on the LED when streaming is underway.  This
           contains one of PVR2_LED_SCHEME_XXX. */
-       unsigned int led_scheme;
+       unsigned char led_scheme;
 
        /* Control scheme to use if there is a digital tuner.  This
           contains one of PVR2_DIGITAL_SCHEME_XXX.  This is an arbitrary
           integer scheme id; its meaning is contained entirely within the
           driver and is interpreted by logic which must control the
           streaming pathway (search for things which touch this field). */
-       unsigned int digital_control_scheme;
-
-       /* V4L tuner type ID to use with this device (only used if the
-          driver could not discover the type any other way). */
-       int default_tuner_type;
-
-       /* Initial standard bits to use for this device, if not zero.
-          Anything set here is also implied as an available standard.
-          Note: This is ignored if overridden on the module load line via
-          the video_std module option. */
-       v4l2_std_id default_std_mask;
+       unsigned char digital_control_scheme;
 
        /* If set, we don't bother trying to load cx23416 firmware. */
-       char flag_skip_cx23416_firmware;
+       int flag_skip_cx23416_firmware:1;
 
        /* Device has a hauppauge eeprom which we can interrogate. */
-       char flag_has_hauppauge_rom;
+       int flag_has_hauppauge_rom:1;
 
        /* Device does not require a powerup command to be issued. */
-       char flag_no_powerup;
+       int flag_no_powerup:1;
 
        /* Device has a cx25840 - this enables special additional logic to
           handle it. */
-       char flag_has_cx25840;
+       int flag_has_cx25840:1;
 
        /* Device has a wm8775 - this enables special additional logic to
           ensure that it is found. */
-       char flag_has_wm8775;
+       int flag_has_wm8775:1;
 
        /* Device has IR hardware that can be faked into looking like a
           normal Hauppauge i2c IR receiver.  This is currently very
@@ -120,15 +120,15 @@ struct pvr2_device_desc {
           to virtualize the presence of the non-existant IR receiver chip and
           implement the virtual receiver in terms of appropriate FX2
           commands. */
-       char flag_has_hauppauge_custom_ir;
+       int flag_has_hauppauge_custom_ir:1;
 
        /* These bits define which kinds of sources the device can handle.
           Note: Digital tuner presence is inferred by the
           digital_control_scheme enumeration. */
-       char flag_has_fmradio;       /* Has FM radio receiver */
-       char flag_has_analogtuner;   /* Has analog tuner */
-       char flag_has_composite;     /* Has composite input */
-       char flag_has_svideo;        /* Has s-video input */
+       int flag_has_fmradio:1;       /* Has FM radio receiver */
+       int flag_has_analogtuner:1;   /* Has analog tuner */
+       int flag_has_composite:1;     /* Has composite input */
+       int flag_has_svideo:1;        /* Has s-video input */
 };
 
 extern struct usb_device_id pvr2_device_table[];