libata: make reset related methods proper port operations

[mv-sheeva.git] / include / linux / istallion.h

diff --git a/include/linux/istallion.h b/include/linux/istallion.h
index af2c32d16d45c719b3b08352a51965610ecb4d1b..5a84fe944b745ba8c27cd81046abb9e622ac148f 100644 (file)
--- a/include/linux/istallion.h
+++ b/include/linux/istallion.h
@@ -51,11 +51,11 @@
  */
 struct stliport {
        unsigned long           magic;
-       int                     portnr;
-       int                     panelnr;
-       int                     brdnr;
+       unsigned int            portnr;
+       unsigned int            panelnr;
+       unsigned int            brdnr;
        unsigned long           state;
-       int                     devnr;
+       unsigned int            devnr;
        int                     flags;
        int                     baud_base;
        int                     custom_divisor;
@@ -71,7 +71,6 @@ struct stliport {
        wait_queue_head_t       open_wait;
        wait_queue_head_t       close_wait;
        wait_queue_head_t       raw_wait;
-       struct work_struct      tqhangup;
        struct asysigs          asig;
        unsigned long           addr;
        unsigned long           rxoffset;
@@ -91,23 +90,23 @@ struct stliport {
  */
 struct stlibrd {
        unsigned long   magic;
-       int             brdnr;
-       int             brdtype;
-       int             state;
-       int             nrpanels;
-       int             nrports;
-       int             nrdevs;
+       unsigned int    brdnr;
+       unsigned int    brdtype;
+       unsigned int    state;
+       unsigned int    nrpanels;
+       unsigned int    nrports;
+       unsigned int    nrdevs;
        unsigned int    iobase;
        int             iosize;
        unsigned long   memaddr;
        void            __iomem *membase;
-       int             memsize;
+       unsigned long   memsize;
        int             pagesize;
        int             hostoffset;
        int             slaveoffset;
        int             bitsize;
        int             enabval;
-       int             panels[STL_MAXPANELS];
+       unsigned int    panels[STL_MAXPANELS];
        int             panelids[STL_MAXPANELS];
        void            (*init)(struct stlibrd *brdp);
        void            (*enable)(struct stlibrd *brdp);