Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / scsi / megaraid / megaraid_ioctl.h

diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h
index bdaee144a1c3f98e5e0c7d2599b32649f81c462d..706fa05a187af715c9abc50fbf47cac4f8fcd2f2 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_ioctl.h
+++ b/drivers/scsi/megaraid/megaraid_ioctl.h
@@ -22,23 +22,23 @@
 
 #include "mbox_defs.h"
 
+/*
+ * console messages debug levels
+ */
+#define        CL_ANN          0       /* print unconditionally, announcements */
+#define CL_DLEVEL1     1       /* debug level 1, informative */
+#define CL_DLEVEL2     2       /* debug level 2, verbose */
+#define CL_DLEVEL3     3       /* debug level 3, very verbose */
+
 /**
  * con_log() - console log routine
- * @param level                : indicates the severity of the message.
- * @fparam mt          : format string
+ * @level              : indicates the severity of the message.
+ * @fmt                        : format string
  *
  * con_log displays the error messages on the console based on the current
  * debug level. Also it attaches the appropriate kernel severity level with
  * the message.
- *
- *
- * consolge messages debug levels
  */
-#define        CL_ANN          0       /* print unconditionally, announcements */
-#define CL_DLEVEL1     1       /* debug level 1, informative */
-#define CL_DLEVEL2     2       /* debug level 2, verbose */
-#define CL_DLEVEL3     3       /* debug level 3, very verbose */
-
 #define        con_log(level, fmt) if (LSI_DBGLVL >= level) printk fmt;
 
 /*
@@ -132,6 +132,10 @@ typedef struct uioc {
 /* Driver Data: */
        void __user *           user_data;
        uint32_t                user_data_len;
+
+       /* 64bit alignment */
+       uint32_t                pad_for_64bit_align;
+
        mraid_passthru_t        __user *user_pthru;
 
        mraid_passthru_t        *pthru32;
@@ -153,14 +157,14 @@ typedef struct uioc {
 /**
  * struct mraid_hba_info - information about the controller
  *
- * @param pci_vendor_id                : PCI vendor id
- * @param pci_device_id                : PCI device id
- * @param subsystem_vendor_id  : PCI subsystem vendor id
- * @param subsystem_device_id  : PCI subsystem device id
- * @param baseport             : base port of hba memory
- * @param pci_bus              : PCI bus
- * @param pci_dev_fn           : PCI device/function values
- * @param irq                  : interrupt vector for the device
+ * @pci_vendor_id              : PCI vendor id
+ * @pci_device_id              : PCI device id
+ * @subsystem_vendor_id                : PCI subsystem vendor id
+ * @subsystem_device_id                : PCI subsystem device id
+ * @baseport                   : base port of hba memory
+ * @pci_bus                    : PCI bus
+ * @pci_dev_fn                 : PCI device/function values
+ * @irq                                : interrupt vector for the device
  *
  * Extended information of 256 bytes about the controller. Align on the single
  * byte boundary so that 32-bit applications can be run on 64-bit platform