3 files changed, 63 insertions, 113 deletions

diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index e8d50af58201..ef5e6b130c48 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -506,6 +506,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma)
         vma->vm_ops = &drm_vm_dma_ops;
 
         vma->vm_flags |= VM_RESERVED;   /* Don't swap */
+        vma->vm_flags |= VM_DONTEXPAND;
 
         vma->vm_file = filp;    /* Needed for drm_vm_open() */
         drm_vm_open_locked(vma);
@@ -655,6 +656,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                 return -EINVAL; /* This should never happen. */
         }
         vma->vm_flags |= VM_RESERVED;   /* Don't swap */
+        vma->vm_flags |= VM_DONTEXPAND;
 
         vma->vm_file = filp;    /* Needed for drm_vm_open() */
         drm_vm_open_locked(vma);
diff --git a/drivers/char/mspec.c b/drivers/char/mspec.c
index 82f2e27dca7d..ff146c2b08fd 100644
--- a/drivers/char/mspec.c
+++ b/drivers/char/mspec.c
@@ -283,7 +283,7 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma,
         vdata->refcnt = ATOMIC_INIT(1);
         vma->vm_private_data = vdata;
 
-        vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP);
+        vma->vm_flags |= (VM_IO | VM_RESERVED | VM_PFNMAP | VM_DONTEXPAND);
         if (vdata->type == MSPEC_FETCHOP || vdata->type == MSPEC_UNCACHED)
                 vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
         vma->vm_ops = &mspec_vm_ops;
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 6076e662886a..dfaab2322de3 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -2,7 +2,7 @@
  * nozomi.c  -- HSDPA driver Broadband Wireless Data Card - Globe Trotter
  *
  * Written by: Ulf Jakobsson,
- *             Jan �erfeldt,
+ *             Jan Åkerfeldt,
  *             Stefan Thomasson,
  *
  * Maintained by: Paul Hardwick (p.hardwick@option.com)
@@ -38,60 +38,6 @@
  * --------------------------------------------------------------------------
  */
 
-/*
- * CHANGELOG
- * Version 2.1d
- * 11-November-2007 Jiri Slaby, Frank Seidel
- * - Big rework of multicard support by Jiri
- * - Major cleanups (semaphore to mutex, endianess, no major reservation)
- * - Optimizations
- *
- * Version 2.1c
- * 30-October-2007 Frank Seidel
- * - Completed multicard support
- * - Minor cleanups
- *
- * Version 2.1b
- * 07-August-2007 Frank Seidel
- * - Minor cleanups
- * - theoretical multicard support
- *
- * Version 2.1
- * 03-July-2006 Paul Hardwick
- *
- * - Stability Improvements. Incorporated spinlock wraps patch.
- * - Updated for newer 2.6.14+ kernels (tty_buffer_request_room)
- * - using __devexit macro for tty
- *
- *
- * Version 2.0
- * 08-feb-2006 15:34:10:Ulf
- *
- * -Fixed issue when not waking up line disipine layer, could probably result
- *  in better uplink performance for 2.4.
- *
- * -Fixed issue with big endian during initalization, now proper toggle flags
- *  are handled between preloader and maincode.
- *
- * -Fixed flow control issue.
- *
- * -Added support for setting DTR.
- *
- * -For 2.4 kernels, removing temporary buffer that's not needed.
- *
- * -Reading CTS only for modem port (only port that supports it).
- *
- * -Return 0 in write_room instead of netative value, it's not handled in
- *  upper layer.
- *
- * --------------------------------------------------------------------------
- * Version 1.0
- *
- * First version of driver, only tested with card of type F32_2.
- * Works fine with 2.4 and 2.6 kernels.
- * Driver also support big endian architecture.
- */
-
 /* Enable this to have a lot of debug printouts */
 #define DEBUG
 
@@ -143,8 +89,9 @@ do {								\
 /* Do we need this settable at runtime? */
 static int debug = NOZOMI_DEBUG_LEVEL;
 
-#define D(lvl, args...)  do {if (lvl & debug) NFO(KERN_DEBUG, ##args); } \
-                                while (0)
+#define D(lvl, args...)  do \
+                        {if (lvl & debug) NFO(KERN_DEBUG, ##args); } \
+                        while (0)
 #define D_(lvl, args...) D(lvl, ##args)
 
 /* These printouts are always printed */
@@ -273,13 +220,13 @@ enum port_type {
 /* Big endian */
 
 struct toggles {
-        unsigned enabled:5;     /*
+        unsigned int enabled:5; /*
                                  * Toggle fields are valid if enabled is 0,
                                  * else A-channels must always be used.
                                  */
-        unsigned diag_dl:1;
-        unsigned mdm_dl:1;
-        unsigned mdm_ul:1;
+        unsigned int diag_dl:1;
+        unsigned int mdm_dl:1;
+        unsigned int mdm_ul:1;
 } __attribute__ ((packed));
 
 /* Configuration table to read at startup of card */
@@ -320,19 +267,19 @@ struct config_table {
 /* This stores all control downlink flags */
 struct ctrl_dl {
         u8 port;
-        unsigned reserved:4;
-        unsigned CTS:1;
-        unsigned RI:1;
-        unsigned DCD:1;
-        unsigned DSR:1;
+        unsigned int reserved:4;
+        unsigned int CTS:1;
+        unsigned int RI:1;
+        unsigned int DCD:1;
+        unsigned int DSR:1;
 } __attribute__ ((packed));
 
 /* This stores all control uplink flags */
 struct ctrl_ul {
         u8 port;
-        unsigned reserved:6;
-        unsigned RTS:1;
-        unsigned DTR:1;
+        unsigned int reserved:6;
+        unsigned int RTS:1;
+        unsigned int DTR:1;
 } __attribute__ ((packed));
 
 #else
@@ -340,10 +287,10 @@ struct ctrl_ul {
 
 /* This represents the toggle information */
 struct toggles {
-        unsigned mdm_ul:1;
-        unsigned mdm_dl:1;
-        unsigned diag_dl:1;
-        unsigned enabled:5;     /*
+        unsigned int mdm_ul:1;
+        unsigned int mdm_dl:1;
+        unsigned int diag_dl:1;
+        unsigned int enabled:5; /*
                                  * Toggle fields are valid if enabled is 0,
                                  * else A-channels must always be used.
                                  */
@@ -379,19 +326,19 @@ struct config_table {
 
 /* This stores all control downlink flags */
 struct ctrl_dl {
-        unsigned DSR:1;
-        unsigned DCD:1;
-        unsigned RI:1;
-        unsigned CTS:1;
-        unsigned reserverd:4;
+        unsigned int DSR:1;
+        unsigned int DCD:1;
+        unsigned int RI:1;
+        unsigned int CTS:1;
+        unsigned int reserverd:4;
         u8 port;
 } __attribute__ ((packed));
 
 /* This stores all control uplink flags */
 struct ctrl_ul {
-        unsigned DTR:1;
-        unsigned RTS:1;
-        unsigned reserved:6;
+        unsigned int DTR:1;
+        unsigned int RTS:1;
+        unsigned int reserved:6;
         u8 port;
 } __attribute__ ((packed));
 #endif
@@ -448,7 +395,7 @@ struct buffer {
 } __attribute__ ((packed));
 
 /*    Global variables */
-static struct pci_device_id nozomi_pci_tbl[] = {
+static const struct pci_device_id nozomi_pci_tbl[] __devinitconst = {
         {PCI_DEVICE(VENDOR1, DEVICE1)},
         {},
 };
@@ -524,12 +471,12 @@ out:
  * -Optimize
  * -Rewrite cleaner
  */
-static u32 write_mem32(void __iomem *mem_addr_start, u32 *buf,
+static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                         u32 size_bytes)
 {
         u32 i = 0;
         u32 *ptr = (__force u32 *) mem_addr_start;
-        u16 *buf16;
+        const u16 *buf16;
 
         if (unlikely(!ptr || !buf))
                 return 0;
@@ -537,7 +484,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, u32 *buf,
         /* shortcut for extremely often used cases */
         switch (size_bytes) {
         case 2: /* 2 bytes */
-                buf16 = (u16 *) buf;
+                buf16 = (const u16 *)buf;
                 writew(__cpu_to_le16(*buf16), (void __iomem *)ptr);
                 return 2;
                 break;
@@ -554,7 +501,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, u32 *buf,
         while (i < size_bytes) {
                 if (size_bytes - i == 2) {
                         /* 2 bytes */
-                        buf16 = (u16 *) buf;
+                        buf16 = (const u16 *)buf;
                         writew(__cpu_to_le16(*buf16), (void __iomem *)ptr);
                         i += 2;
                 } else {
@@ -694,7 +641,7 @@ static void dump_table(const struct nozomi *dc)
            dc->config_table.ul_ctrl_len);
 }
 #else
-static __inline__ void dump_table(const struct nozomi *dc) { }
+static inline void dump_table(const struct nozomi *dc) { }
 #endif
 
 /*
@@ -776,8 +723,7 @@ static int nozomi_read_config_table(struct nozomi *dc)
 /* Enable uplink interrupts  */
 static void enable_transmit_ul(enum port_type port, struct nozomi *dc)
 {
-        u16 mask[NOZOMI_MAX_PORTS] = \
-                        {MDM_UL, DIAG_UL, APP1_UL, APP2_UL, CTRL_UL};
+        static const u16 mask[] = {MDM_UL, DIAG_UL, APP1_UL, APP2_UL, CTRL_UL};
 
         if (port < NOZOMI_MAX_PORTS) {
                 dc->last_ier |= mask[port];
@@ -790,8 +736,8 @@ static void enable_transmit_ul(enum port_type port, struct nozomi *dc)
 /* Disable uplink interrupts  */
 static void disable_transmit_ul(enum port_type port, struct nozomi *dc)
 {
-        u16 mask[NOZOMI_MAX_PORTS] = \
-                        {~MDM_UL, ~DIAG_UL, ~APP1_UL, ~APP2_UL, ~CTRL_UL};
+        static const u16 mask[] =
+                {~MDM_UL, ~DIAG_UL, ~APP1_UL, ~APP2_UL, ~CTRL_UL};
 
         if (port < NOZOMI_MAX_PORTS) {
                 dc->last_ier &= mask[port];
@@ -804,8 +750,7 @@ static void disable_transmit_ul(enum port_type port, struct nozomi *dc)
 /* Enable downlink interrupts */
 static void enable_transmit_dl(enum port_type port, struct nozomi *dc)
 {
-        u16 mask[NOZOMI_MAX_PORTS] = \
-                        {MDM_DL, DIAG_DL, APP1_DL, APP2_DL, CTRL_DL};
+        static const u16 mask[] = {MDM_DL, DIAG_DL, APP1_DL, APP2_DL, CTRL_DL};
 
         if (port < NOZOMI_MAX_PORTS) {
                 dc->last_ier |= mask[port];
@@ -818,8 +763,8 @@ static void enable_transmit_dl(enum port_type port, struct nozomi *dc)
 /* Disable downlink interrupts */
 static void disable_transmit_dl(enum port_type port, struct nozomi *dc)
 {
-        u16 mask[NOZOMI_MAX_PORTS] = \
-                        {~MDM_DL, ~DIAG_DL, ~APP1_DL, ~APP2_DL, ~CTRL_DL};
+        static const u16 mask[] =
+                {~MDM_DL, ~DIAG_DL, ~APP1_DL, ~APP2_DL, ~CTRL_DL};
 
         if (port < NOZOMI_MAX_PORTS) {
                 dc->last_ier &= mask[port];
@@ -833,13 +778,13 @@ static void disable_transmit_dl(enum port_type port, struct nozomi *dc)
  * Return 1 - send buffer to card and ack.
  * Return 0 - don't ack, don't send buffer to card.
  */
-static int send_data(enum port_type index, struct nozomi *dc)
+static int send_data(enum port_type index, const struct nozomi *dc)
 {
         u32 size = 0;
-        struct port *port = &dc->port[index];
-        u8 toggle = port->toggle_ul;
+        const struct port *port = &dc->port[index];
+        const u8 toggle = port->toggle_ul;
         void __iomem *addr = port->ul_addr[toggle];
-        u32 ul_size = port->ul_size[toggle];
+        const u32 ul_size = port->ul_size[toggle];
         struct tty_struct *tty = port->tty;
 
         /* Get data from tty and place in buf for now */
@@ -1102,7 +1047,7 @@ static int send_flow_control(struct nozomi *dc)
 }
 
 /*
- * Handle donlink data, ports that are handled are modem and diagnostics
+ * Handle downlink data, ports that are handled are modem and diagnostics
  * Return 1 - ok
  * Return 0 - toggle fields are out of sync
  */
@@ -1359,20 +1304,20 @@ static void nozomi_setup_private_data(struct nozomi *dc)
 static ssize_t card_type_show(struct device *dev, struct device_attribute *attr,
                           char *buf)
 {
-        struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
+        const struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
 
         return sprintf(buf, "%d\n", dc->card_type);
 }
-static DEVICE_ATTR(card_type, 0444, card_type_show, NULL);
+static DEVICE_ATTR(card_type, S_IRUGO, card_type_show, NULL);
 
 static ssize_t open_ttys_show(struct device *dev, struct device_attribute *attr,
                           char *buf)
 {
-        struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
+        const struct nozomi *dc = pci_get_drvdata(to_pci_dev(dev));
 
         return sprintf(buf, "%u\n", dc->open_ttys);
 }
-static DEVICE_ATTR(open_ttys, 0444, open_ttys_show, NULL);
+static DEVICE_ATTR(open_ttys, S_IRUGO, open_ttys_show, NULL);
 
 static void make_sysfs_files(struct nozomi *dc)
 {
@@ -1735,7 +1680,7 @@ static int ntty_write_room(struct tty_struct *tty)
 {
         struct port *port = tty->driver_data;
         int room = 0;
-        struct nozomi *dc = get_dc_by_tty(tty);
+        const struct nozomi *dc = get_dc_by_tty(tty);
 
         if (!dc || !port)
                 return 0;
@@ -1755,9 +1700,9 @@ exit:
 /* Gets io control parameters */
 static int ntty_tiocmget(struct tty_struct *tty, struct file *file)
 {
-        struct port *port = tty->driver_data;
-        struct ctrl_dl *ctrl_dl = &port->ctrl_dl;
-        struct ctrl_ul *ctrl_ul = &port->ctrl_ul;
+        const struct port *port = tty->driver_data;
+        const struct ctrl_dl *ctrl_dl = &port->ctrl_dl;
+        const struct ctrl_ul *ctrl_ul = &port->ctrl_ul;
 
         return  (ctrl_ul->RTS ? TIOCM_RTS : 0) |
                 (ctrl_ul->DTR ? TIOCM_DTR : 0) |
@@ -1787,7 +1732,7 @@ static int ntty_tiocmset(struct tty_struct *tty, struct file *file,
 static int ntty_cflags_changed(struct port *port, unsigned long flags,
                 struct async_icount *cprev)
 {
-        struct async_icount cnow = port->tty_icount;
+        const struct async_icount cnow = port->tty_icount;
         int ret;
 
         ret =   ((flags & TIOCM_RNG) && (cnow.rng != cprev->rng)) ||
@@ -1802,7 +1747,7 @@ static int ntty_cflags_changed(struct port *port, unsigned long flags,
 
 static int ntty_ioctl_tiocgicount(struct port *port, void __user *argp)
 {
-        struct async_icount cnow = port->tty_icount;
+        const struct async_icount cnow = port->tty_icount;
         struct serial_icounter_struct icount;
 
         icount.cts = cnow.cts;
@@ -1882,7 +1827,10 @@ static void ntty_throttle(struct tty_struct *tty)
 /* just to discard single character writes */
 static void ntty_put_char(struct tty_struct *tty, unsigned char c)
 {
-        /* FIXME !!! */
+        /*
+         * card does not react correct when we write single chars
+         * to the card, so we discard them
+         */
         DBG2("PUT CHAR Function: %c", c);
 }
 
@@ -1910,7 +1858,7 @@ exit_in_buffer:
         return rval;
 }
 
-static struct tty_operations tty_ops = {
+static const struct tty_operations tty_ops = {
         .ioctl = ntty_ioctl,
         .open = ntty_open,
         .close = ntty_close,