PCI MSI: Refactor interrupt masking code

[karo-tx-linux.git] / include / linux / msi.h

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 5025ca4d91e4a558b0abfec10b46532122c91cf6..37c1bbe546e5ef6f628695f1c8ba82e710b82934 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -22,14 +22,13 @@ struct msi_desc {
        struct {
                __u8    is_msix : 1;
                __u8    maskbit : 1;    /* mask-pending bit supported ?   */
-               __u8    masked  : 1;
                __u8    is_64   : 1;    /* Address size: 0=32bit 1=64bit  */
                __u8    pos;            /* Location of the msi capability */
                __u16   entry_nr;       /* specific enabled entry         */
-               __u32   maskbits_mask;  /* mask bits mask */
                unsigned default_irq;   /* default pre-assigned irq       */
-       }msi_attrib;
+       } msi_attrib;
 
+       u32 masked;                     /* mask bits */
        unsigned int irq;
        struct list_head list;