Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2011 20:19:00 +0000 (13:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 May 2011 20:19:00 +0000 (13:19 -0700)
* 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  gfs2: Drop __TIME__ usage
  isdn/diva: Drop __TIME__ usage
  atm: Drop __TIME__ usage
  dlm: Drop __TIME__ usage
  wan/pc300: Drop __TIME__ usage
  parport: Drop __TIME__ usage
  hdlcdrv: Drop __TIME__ usage
  baycom: Drop __TIME__ usage
  pmcraid: Drop __DATE__ usage
  edac: Drop __DATE__ usage
  rio: Drop __DATE__ usage
  scsi/wd33c93: Drop __TIME__ usage
  scsi/in2000: Drop __TIME__ usage
  aacraid: Drop __TIME__ usage
  media/cx231xx: Drop __TIME__ usage
  media/radio-maxiradio: Drop __TIME__ usage
  nozomi: Drop __TIME__ usage
  cyclades: Drop __TIME__ usage

17 files changed:
1  2 
drivers/edac/cpc925_edac.c
drivers/edac/i5000_edac.c
drivers/edac/i5400_edac.c
drivers/edac/i7300_edac.c
drivers/edac/i7core_edac.c
drivers/edac/ppc4xx_edac.c
drivers/edac/r82600_edac.c
drivers/media/video/cx231xx/cx231xx-avcore.c
drivers/net/wan/pc300_drv.c
drivers/scsi/in2000.c
drivers/scsi/pmcraid.c
drivers/scsi/pmcraid.h
drivers/scsi/wd33c93.c
drivers/tty/cyclades.c
drivers/tty/nozomi.c
fs/gfs2/main.c
net/atm/lec.c

index 837ad8f85b48e1197dfd4e3f72a7a4340dd432bb,3400ae34795a12589e9ba3f3d64e3919db775af2..a687a0d169624f9f22c82fe3047c83e143ce953d
@@@ -30,7 -30,7 +30,7 @@@
  #include "edac_core.h"
  #include "edac_module.h"
  
- #define CPC925_EDAC_REVISION  " Ver: 1.0.0 " __DATE__
+ #define CPC925_EDAC_REVISION  " Ver: 1.0.0"
  #define CPC925_EDAC_MOD_STR   "cpc925_edac"
  
  #define cpc925_printk(level, fmt, arg...) \
@@@ -817,7 -817,7 +817,7 @@@ static void cpc925_del_edac_devices(voi
        }
  }
  
 -/* Convert current back-ground scrub rate into byte/sec bandwith */
 +/* Convert current back-ground scrub rate into byte/sec bandwidth */
  static int cpc925_get_sdram_scrub_rate(struct mem_ctl_info *mci)
  {
        struct cpc925_mc_pdata *pdata = mci->pvt_info;
index 87f427c2ce5c56dd6b303eea470baa28b2799ace,3d0b726304fefd43ae2d8aa6c454b18159bb4372..4dc3ac25a42261946fe9b8fc6798464ffc104db1
@@@ -27,7 -27,7 +27,7 @@@
  /*
   * Alter this version for the I5000 module when modifications are made
   */
- #define I5000_REVISION    " Ver: 2.0.12 " __DATE__
+ #define I5000_REVISION    " Ver: 2.0.12"
  #define EDAC_MOD_STR      "i5000_edac"
  
  #define i5000_printk(level, fmt, arg...) \
@@@ -1372,7 -1372,7 +1372,7 @@@ static int i5000_probe1(struct pci_dev 
         * actual number of slots/dimms per channel, we thus utilize the
         * resource as specified by the chipset. Thus, we might have
         * have more DIMMs per channel than actually on the mobo, but this
 -       * allows the driver to support upto the chipset max, without
 +       * allows the driver to support up to the chipset max, without
         * some fancy mobo determination.
         */
        i5000_get_dimm_and_channel_counts(pdev, &num_dimms_per_channel,
index 80a465efbae89e2739e493082a0494cfb11e4faf,fd362b4c2a8eeb43a371947bda54a00d59f97081..74d6ec342afbf2e0f34c9d8fe808f3c8b0f6d9c5
@@@ -33,7 -33,7 +33,7 @@@
  /*
   * Alter this version for the I5400 module when modifications are made
   */
- #define I5400_REVISION    " Ver: 1.0.0 " __DATE__
+ #define I5400_REVISION    " Ver: 1.0.0"
  
  #define EDAC_MOD_STR      "i5400_edac"
  
@@@ -648,7 -648,7 +648,7 @@@ static void i5400_process_nonfatal_erro
                return;
        }
  
 -      /* Miscelaneous errors */
 +      /* Miscellaneous errors */
        errnum = find_first_bit(&allErrors, ARRAY_SIZE(error_name));
  
        branch = extract_fbdchan_indx(info->ferr_nf_fbd);
@@@ -1240,7 -1240,7 +1240,7 @@@ static int i5400_probe1(struct pci_dev 
         * actual number of slots/dimms per channel, we thus utilize the
         * resource as specified by the chipset. Thus, we might have
         * have more DIMMs per channel than actually on the mobo, but this
 -       * allows the driver to support upto the chipset max, without
 +       * allows the driver to support up to the chipset max, without
         * some fancy mobo determination.
         */
        num_dimms_per_channel = MAX_DIMMS_PER_CHANNEL;
index 363cc1602944086a9bcbe6406ef1bbee0be209cb,ff320c0b9cac81b14e7fc4ebfcc7d3326eb68913..a76fe8366b681d14cc2e6158fba49133525aeaa3
@@@ -31,7 -31,7 +31,7 @@@
  /*
   * Alter this version for the I7300 module when modifications are made
   */
- #define I7300_REVISION    " Ver: 1.0.0 " __DATE__
+ #define I7300_REVISION    " Ver: 1.0.0"
  
  #define EDAC_MOD_STR      "i7300_edac"
  
@@@ -1065,7 -1065,7 +1065,7 @@@ static int __devinit i7300_init_one(str
         * actual number of slots/dimms per channel, we thus utilize the
         * resource as specified by the chipset. Thus, we might have
         * have more DIMMs per channel than actually on the mobo, but this
 -       * allows the driver to support upto the chipset max, without
 +       * allows the driver to support up to the chipset max, without
         * some fancy mobo determination.
         */
        num_dimms_per_channel = MAX_SLOTS;
index 465cbc25149fffab899997e3d133cacacd5bad5f,3f320ba5445f29c305d56794edf4429c95653ff0..04f1e7ce02b196868d42253243d79d1044d9b7cc
@@@ -59,7 -59,7 +59,7 @@@ MODULE_PARM_DESC(use_pci_fixup, "Enabl
  /*
   * Alter this version for the module when modifications are made
   */
- #define I7CORE_REVISION    " Ver: 1.0.0 " __DATE__
+ #define I7CORE_REVISION    " Ver: 1.0.0"
  #define EDAC_MOD_STR      "i7core_edac"
  
  /*
@@@ -1772,7 -1772,7 +1772,7 @@@ static void i7core_check_error(struct m
        /*
         * MCE first step: Copy all mce errors into a temporary buffer
         * We use a double buffering here, to reduce the risk of
 -       * loosing an error.
 +       * losing an error.
         */
        smp_rmb();
        count = (pvt->mce_out + MCE_LOG_LEN - pvt->mce_in)
index af8e7b1aa290a2e0d682de5d1aefb9e8808c23e1,208244e4a6f23af5659fdd3276150c5f59ee470d..0de7d8770891e5421a52f7a8732b66e09dd13423
  #define EDAC_OPSTATE_UNKNOWN_STR      "unknown"
  
  #define PPC4XX_EDAC_MODULE_NAME               "ppc4xx_edac"
- #define PPC4XX_EDAC_MODULE_REVISION   "v1.0.0 " __DATE__
+ #define PPC4XX_EDAC_MODULE_REVISION   "v1.0.0"
  
  #define PPC4XX_EDAC_MESSAGE_SIZE      256
  
@@@ -1019,7 -1019,7 +1019,7 @@@ ppc4xx_edac_mc_init(struct mem_ctl_inf
        struct ppc4xx_edac_pdata *pdata = NULL;
        const struct device_node *np = op->dev.of_node;
  
 -      if (op->dev.of_match == NULL)
 +      if (of_match_device(ppc4xx_edac_match, &op->dev) == NULL)
                return -EINVAL;
  
        /* Initial driver pointers and private data */
index 678513738c331fbd1497d2c772aab9d0b3dcc143,387997a3fab5d113073739b5d6a4b41d5ecf2c16..b153674431f19c7f4674a03c000da279a62ee878
@@@ -22,7 -22,7 +22,7 @@@
  #include <linux/edac.h>
  #include "edac_core.h"
  
- #define R82600_REVISION       " Ver: 2.0.2 " __DATE__
+ #define R82600_REVISION       " Ver: 2.0.2"
  #define EDAC_MOD_STR  "r82600_edac"
  
  #define r82600_printk(level, fmt, arg...) \
                                 *        write 0=NOP
                                 */
  
 -#define R82600_DRBA   0x60    /* + 0x60..0x63 SDRAM Row Boundry Address
 +#define R82600_DRBA   0x60    /* + 0x60..0x63 SDRAM Row Boundary Address
                                 *  Registers
                                 *
                                 * 7:0  Address lines 30:24 - upper limit of
@@@ -217,7 -217,7 +217,7 @@@ static void r82600_init_csrows(struct m
  {
        struct csrow_info *csrow;
        int index;
 -      u8 drbar;               /* SDRAM Row Boundry Address Register */
 +      u8 drbar;               /* SDRAM Row Boundary Address Register */
        u32 row_high_limit, row_high_limit_last;
        u32 reg_sdram, ecc_on, row_base;
  
                row_high_limit = ((u32) drbar << 24);
  /*            row_high_limit = ((u32)drbar << 24) | 0xffffffUL; */
  
 -              debugf1("%s() Row=%d, Boundry Address=%#0x, Last = %#0x\n",
 +              debugf1("%s() Row=%d, Boundary Address=%#0x, Last = %#0x\n",
                        __func__, index, row_high_limit, row_high_limit_last);
  
                /* Empty row [p.57] */
index 280df43ca446458f639879bf5e3aa18f2229579d,98e876553824c79eaa89438285512e2ff2b085e3..8d7813415760e5f1cf753368f86b0f124e642b55
@@@ -1354,7 -1354,7 +1354,7 @@@ void cx231xx_dump_SC_reg(struct cx231x
  {
        u8 value[4] = { 0, 0, 0, 0 };
        int status = 0;
-       cx231xx_info("cx231xx_dump_SC_reg %s!\n", __TIME__);
+       cx231xx_info("cx231xx_dump_SC_reg!\n");
  
        status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT,
                                 value, 4);
@@@ -2577,7 -2577,7 +2577,7 @@@ int cx231xx_initialize_stream_xfer(stru
                        break;
  
                case 6: /* ts1 parallel mode */
 -                      cx231xx_info("%s: set ts1 parrallel mode registers\n",
 +                      cx231xx_info("%s: set ts1 parallel mode registers\n",
                                     __func__);
                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
                        status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
index 737b59f1a8dc4a28f535434ca207128fad1d4f76,80ae5037cefed1e3c5ce2b5b49750fbdc1ee0372..9617d3d0ee39e055a94150d6ee0cf8b2014cf0e1
@@@ -1445,7 -1445,7 +1445,7 @@@ static void falc_update_stats(pc300_t 
   * Description:       In the remote loopback mode the clock and data recovered
   *            from the line inputs RL1/2 or RDIP/RDIN are routed back
   *            to the line outputs XL1/2 or XDOP/XDON via the analog
 - *            transmitter. As in normal mode they are processsed by
 + *            transmitter. As in normal mode they are processed by
   *            the synchronizer and then sent to the system interface.
   *----------------------------------------------------------------------------
   */
@@@ -3242,8 -3242,7 +3242,7 @@@ static inline void show_version(void
        rcsdate++;
        tmp = strrchr(rcsdate, ' ');
        *tmp = '\0';
-       printk(KERN_INFO "Cyclades-PC300 driver %s %s (built %s %s)\n", 
-               rcsvers, rcsdate, __DATE__, __TIME__);
+       printk(KERN_INFO "Cyclades-PC300 driver %s %s\n", rcsvers, rcsdate);
  }                             /* show_version */
  
  static const struct net_device_ops cpc_netdev_ops = {
diff --combined drivers/scsi/in2000.c
index 92109b126391ded6206c5d80dabd457ec03891e3,6096d93404071abee2971512508c64dcb52e1130..112f1bec7756d4ac2da9ed16790a746d8104a110
@@@ -343,7 -343,7 +343,7 @@@ static int in2000_queuecommand_lck(Scsi
        instance = cmd->device->host;
        hostdata = (struct IN2000_hostdata *) instance->hostdata;
  
 -      DB(DB_QUEUE_COMMAND, scmd_printk(KERN_DEBUG, cmd, "Q-%02x-%ld(", cmd->cmnd[0], cmd->serial_number))
 +      DB(DB_QUEUE_COMMAND, scmd_printk(KERN_DEBUG, cmd, "Q-%02x(", cmd->cmnd[0]))
  
  /* Set up a few fields in the Scsi_Cmnd structure for our own use:
   *  - host_scribble is the pointer to the next cmd in the input queue
  
        in2000_execute(cmd->device->host);
  
 -      DB(DB_QUEUE_COMMAND, printk(")Q-%ld ", cmd->serial_number))
 +      DB(DB_QUEUE_COMMAND, printk(")Q "))
            return 0;
  }
  
@@@ -705,7 -705,7 +705,7 @@@ static void in2000_execute(struct Scsi_
         * to search the input_Q again...
         */
  
 -      DB(DB_EXECUTE, printk("%s%ld)EX-2 ", (cmd->SCp.phase) ? "d:" : "", cmd->serial_number))
 +      DB(DB_EXECUTE, printk("%s)EX-2 ", (cmd->SCp.phase) ? "d:" : ""))
  
  }
  
@@@ -1149,7 -1149,7 +1149,7 @@@ static irqreturn_t in2000_intr(int irqn
        case CSR_XFER_DONE | PHS_COMMAND:
        case CSR_UNEXP | PHS_COMMAND:
        case CSR_SRV_REQ | PHS_COMMAND:
 -              DB(DB_INTR, printk("CMND-%02x,%ld", cmd->cmnd[0], cmd->serial_number))
 +              DB(DB_INTR, printk("CMND-%02x", cmd->cmnd[0]))
                    transfer_pio(cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR, hostdata);
                hostdata->state = S_CONNECTED;
                break;
                switch (msg) {
  
                case COMMAND_COMPLETE:
 -                      DB(DB_INTR, printk("CCMP-%ld", cmd->serial_number))
 +                      DB(DB_INTR, printk("CCMP"))
                            write_3393_cmd(hostdata, WD_CMD_NEGATE_ACK);
                        hostdata->state = S_PRE_CMP_DISC;
                        break;
  
                write_3393(hostdata, WD_SOURCE_ID, SRCID_ER);
                if (phs == 0x60) {
 -                      DB(DB_INTR, printk("SX-DONE-%ld", cmd->serial_number))
 +                      DB(DB_INTR, printk("SX-DONE"))
                            cmd->SCp.Message = COMMAND_COMPLETE;
                        lun = read_3393(hostdata, WD_TARGET_LUN);
                        DB(DB_INTR, printk(":%d.%d", cmd->SCp.Status, lun))
  
                        in2000_execute(instance);
                } else {
 -                      printk("%02x:%02x:%02x-%ld: Unknown SEL_XFER_DONE phase!!---", asr, sr, phs, cmd->serial_number);
 +                      printk("%02x:%02x:%02x: Unknown SEL_XFER_DONE phase!!---", asr, sr, phs);
                }
                break;
  
                        spin_unlock_irqrestore(instance->host_lock, flags);
                        return IRQ_HANDLED;
                }
 -              DB(DB_INTR, printk("UNEXP_DISC-%ld", cmd->serial_number))
 +              DB(DB_INTR, printk("UNEXP_DISC"))
                    hostdata->connected = NULL;
                hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
                hostdata->state = S_UNCONNECTED;
   */
  
                write_3393(hostdata, WD_SOURCE_ID, SRCID_ER);
 -              DB(DB_INTR, printk("DISC-%ld", cmd->serial_number))
 +              DB(DB_INTR, printk("DISC"))
                    if (cmd == NULL) {
                        printk(" - Already disconnected! ");
                        hostdata->state = S_UNCONNECTED;
                } else
                        hostdata->state = S_CONNECTED;
  
 -              DB(DB_INTR, printk("-%ld", cmd->serial_number))
                    break;
  
        default:
@@@ -1703,7 -1704,7 +1703,7 @@@ static int __in2000_abort(Scsi_Cmnd * c
                                prev->host_scribble = cmd->host_scribble;
                        cmd->host_scribble = NULL;
                        cmd->result = DID_ABORT << 16;
 -                      printk(KERN_WARNING "scsi%d: Abort - removing command %ld from input_Q. ", instance->host_no, cmd->serial_number);
 +                      printk(KERN_WARNING "scsi%d: Abort - removing command from input_Q. ", instance->host_no);
                        cmd->scsi_done(cmd);
                        return SUCCESS;
                }
  
        if (hostdata->connected == cmd) {
  
 -              printk(KERN_WARNING "scsi%d: Aborting connected command %ld - ", instance->host_no, cmd->serial_number);
 +              printk(KERN_WARNING "scsi%d: Aborting connected command - ", instance->host_no);
  
                printk("sending wd33c93 ABORT command - ");
                write_3393(hostdata, WD_CONTROL, CTRL_IDI | CTRL_EDI | CTRL_POLLED);
@@@ -2227,7 -2228,7 +2227,7 @@@ static int in2000_proc_info(struct Scsi
        bp = buf;
        *bp = '\0';
        if (hd->proc & PR_VERSION) {
-               sprintf(tbuf, "\nVersion %s - %s. Compiled %s %s", IN2000_VERSION, IN2000_DATE, __DATE__, __TIME__);
+               sprintf(tbuf, "\nVersion %s - %s.", IN2000_VERSION, IN2000_DATE);
                strcat(bp, tbuf);
        }
        if (hd->proc & PR_INFO) {
                strcat(bp, "\nconnected:     ");
                if (hd->connected) {
                        cmd = (Scsi_Cmnd *) hd->connected;
 -                      sprintf(tbuf, " %ld-%d:%d(%02x)", cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
 +                      sprintf(tbuf, " %d:%d(%02x)", cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
                        strcat(bp, tbuf);
                }
        }
                strcat(bp, "\ninput_Q:       ");
                cmd = (Scsi_Cmnd *) hd->input_Q;
                while (cmd) {
 -                      sprintf(tbuf, " %ld-%d:%d(%02x)", cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
 +                      sprintf(tbuf, " %d:%d(%02x)", cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
                        strcat(bp, tbuf);
                        cmd = (Scsi_Cmnd *) cmd->host_scribble;
                }
                strcat(bp, "\ndisconnected_Q:");
                cmd = (Scsi_Cmnd *) hd->disconnected_Q;
                while (cmd) {
 -                      sprintf(tbuf, " %ld-%d:%d(%02x)", cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
 +                      sprintf(tbuf, " %d:%d(%02x)", cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
                        strcat(bp, tbuf);
                        cmd = (Scsi_Cmnd *) cmd->host_scribble;
                }
diff --combined drivers/scsi/pmcraid.c
index 7f636b118287a7bb0f9e3ac7d1cdecb27ed0598d,c83bc5e7753b2969efaa752ebf5070fe6e7dce4c..fca6a895307093a4630530b83e03e66b7fd447cd
@@@ -213,7 -213,7 +213,7 @@@ static int pmcraid_slave_alloc(struct s
   * pmcraid_slave_configure - Configures a SCSI device
   * @scsi_dev: scsi device struct
   *
 - * This fucntion is executed by SCSI mid layer just after a device is first
 + * This function is executed by SCSI mid layer just after a device is first
   * scanned (i.e. it has responded to an INQUIRY). For VSET resources, the
   * timeout value (default 30s) will be over-written to a higher value (60s)
   * and max_sectors value will be over-written to 512. It also sets queue depth
@@@ -2122,7 -2122,7 +2122,7 @@@ static void pmcraid_fail_outstanding_cm
   *
   * This function executes most of the steps required for IOA reset. This gets
   * called by user threads (modprobe/insmod/rmmod) timer, tasklet and midlayer's
 - * 'eh_' thread. Access to variables used for controling the reset sequence is
 + * 'eh_' thread. Access to variables used for controlling the reset sequence is
   * synchronized using host lock. Various functions called during reset process
   * would make use of a single command block, pointer to which is also stored in
   * adapter instance structure.
@@@ -2994,7 -2994,7 +2994,7 @@@ static int pmcraid_abort_complete(struc
  
        /* If the abort task is not timed out we will get a Good completion
         * as sense_key, otherwise we may get one the following responses
 -       * due to subsquent bus reset or device reset. In case IOASC is
 +       * due to subsequent bus reset or device reset. In case IOASC is
         * NR_SYNC_REQUIRED, set sync_reqd flag for the corresponding resource
         */
        if (ioasc == PMCRAID_IOASC_UA_BUS_WAS_RESET ||
@@@ -3814,9 -3814,6 +3814,9 @@@ static long pmcraid_ioctl_passthrough
                        rc = -EFAULT;
                        goto out_free_buffer;
                }
 +      } else if (request_size < 0) {
 +              rc = -EINVAL;
 +              goto out_free_buffer;
        }
  
        /* check if we have any additional command parameters */
  
                        /* if abort task couldn't find the command i.e it got
                         * completed prior to aborting, return good completion.
 -                       * if command got aborted succesfully or there was IOA
 +                       * if command got aborted successfully or there was IOA
                         * reset due to abort task itself getting timedout then
                         * return -ETIMEDOUT
                         */
@@@ -4252,8 -4249,8 +4252,8 @@@ static ssize_t pmcraid_show_drv_version
        char *buf
  )
  {
-       return snprintf(buf, PAGE_SIZE, "version: %s, build date: %s\n",
-                       PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE);
+       return snprintf(buf, PAGE_SIZE, "version: %s\n",
+                       PMCRAID_DRIVER_VERSION);
  }
  
  static struct device_attribute pmcraid_driver_version_attr = {
@@@ -5935,7 -5932,7 +5935,7 @@@ static int __devinit pmcraid_probe
         * However, firmware supports 64-bit streaming DMA buffers, whereas
         * coherent buffers are to be 32-bit. Since pci_alloc_consistent always
         * returns memory within 4GB (if not, change this logic), coherent
 -       * buffers are within firmware acceptible address ranges.
 +       * buffers are within firmware acceptable address ranges.
         */
        if ((sizeof(dma_addr_t) == 4) ||
            pci_set_dma_mask(pdev, DMA_BIT_MASK(64)))
@@@ -6096,9 -6093,8 +6096,8 @@@ static int __init pmcraid_init(void
        dev_t dev;
        int error;
  
-       pmcraid_info("%s Device Driver version: %s %s\n",
-                        PMCRAID_DRIVER_NAME,
-                        PMCRAID_DRIVER_VERSION, PMCRAID_DRIVER_DATE);
+       pmcraid_info("%s Device Driver version: %s\n",
+                        PMCRAID_DRIVER_NAME, PMCRAID_DRIVER_VERSION);
  
        error = alloc_chrdev_region(&dev, 0,
                                    PMCRAID_MAX_ADAPTERS,
diff --combined drivers/scsi/pmcraid.h
index 34e4c915002ef37332afc6ea949e94d90a8b22b3,d302737c279c710da5c4931105ed793da7ef44d3..f920baf3ff24638f6c28a1ecf36bc2d70916f9c4
@@@ -43,7 -43,6 +43,6 @@@
  #define PMCRAID_DRIVER_NAME           "PMC MaxRAID"
  #define PMCRAID_DEVFILE                       "pmcsas"
  #define PMCRAID_DRIVER_VERSION                "1.0.3"
- #define PMCRAID_DRIVER_DATE           __DATE__
  
  #define PMCRAID_FW_VERSION_1          0x002
  
@@@ -1024,7 -1023,7 +1023,7 @@@ static struct pmcraid_ioasc_error pmcra
  
  
  /*
 - * pmcraid_ioctl_header - definition of header structure that preceeds all the
 + * pmcraid_ioctl_header - definition of header structure that precedes all the
   * buffers given as ioctl arguments.
   *
   * .signature           : always ASCII string, "PMCRAID"
diff --combined drivers/scsi/wd33c93.c
index 97ae716134d05fb1ae76732925e480e736592081,6c983a2ffcbe8f6095c55beb8bd44f7a3b5863d2..c0ee4ea28a19707896c3a74021c4e231bd5d4880
@@@ -381,7 -381,7 +381,7 @@@ wd33c93_queuecommand_lck(struct scsi_cm
        hostdata = (struct WD33C93_hostdata *) cmd->device->host->hostdata;
  
        DB(DB_QUEUE_COMMAND,
 -         printk("Q-%d-%02x-%ld( ", cmd->device->id, cmd->cmnd[0], cmd->serial_number))
 +         printk("Q-%d-%02x( ", cmd->device->id, cmd->cmnd[0]))
  
  /* Set up a few fields in the scsi_cmnd structure for our own use:
   *  - host_scribble is the pointer to the next cmd in the input queue
  
        wd33c93_execute(cmd->device->host);
  
 -      DB(DB_QUEUE_COMMAND, printk(")Q-%ld ", cmd->serial_number))
 +      DB(DB_QUEUE_COMMAND, printk(")Q "))
  
        spin_unlock_irq(&hostdata->lock);
        return 0;
@@@ -687,7 -687,7 +687,7 @@@ wd33c93_execute(struct Scsi_Host *insta
         */
  
        DB(DB_EXECUTE,
 -         printk("%s%ld)EX-2 ", (cmd->SCp.phase) ? "d:" : "", cmd->serial_number))
 +         printk("%s)EX-2 ", (cmd->SCp.phase) ? "d:" : ""))
  }
  
  static void
@@@ -963,7 -963,7 +963,7 @@@ wd33c93_intr(struct Scsi_Host *instance
        case CSR_XFER_DONE | PHS_COMMAND:
        case CSR_UNEXP | PHS_COMMAND:
        case CSR_SRV_REQ | PHS_COMMAND:
 -              DB(DB_INTR, printk("CMND-%02x,%ld", cmd->cmnd[0], cmd->serial_number))
 +              DB(DB_INTR, printk("CMND-%02x", cmd->cmnd[0]))
                    transfer_pio(regs, cmd->cmnd, cmd->cmd_len, DATA_OUT_DIR,
                                 hostdata);
                hostdata->state = S_CONNECTED;
                switch (msg) {
  
                case COMMAND_COMPLETE:
 -                      DB(DB_INTR, printk("CCMP-%ld", cmd->serial_number))
 +                      DB(DB_INTR, printk("CCMP"))
                            write_wd33c93_cmd(regs, WD_CMD_NEGATE_ACK);
                        hostdata->state = S_PRE_CMP_DISC;
                        break;
  
                write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER);
                if (phs == 0x60) {
 -                      DB(DB_INTR, printk("SX-DONE-%ld", cmd->serial_number))
 +                      DB(DB_INTR, printk("SX-DONE"))
                            cmd->SCp.Message = COMMAND_COMPLETE;
                        lun = read_wd33c93(regs, WD_TARGET_LUN);
                        DB(DB_INTR, printk(":%d.%d", cmd->SCp.Status, lun))
                        wd33c93_execute(instance);
                } else {
                        printk
 -                          ("%02x:%02x:%02x-%ld: Unknown SEL_XFER_DONE phase!!---",
 -                           asr, sr, phs, cmd->serial_number);
 +                          ("%02x:%02x:%02x: Unknown SEL_XFER_DONE phase!!---",
 +                           asr, sr, phs);
                        spin_unlock_irqrestore(&hostdata->lock, flags);
                }
                break;
                        spin_unlock_irqrestore(&hostdata->lock, flags);
                        return;
                }
 -              DB(DB_INTR, printk("UNEXP_DISC-%ld", cmd->serial_number))
 +              DB(DB_INTR, printk("UNEXP_DISC"))
                    hostdata->connected = NULL;
                hostdata->busy[cmd->device->id] &= ~(1 << cmd->device->lun);
                hostdata->state = S_UNCONNECTED;
   */
  
                write_wd33c93(regs, WD_SOURCE_ID, SRCID_ER);
 -              DB(DB_INTR, printk("DISC-%ld", cmd->serial_number))
 +              DB(DB_INTR, printk("DISC"))
                    if (cmd == NULL) {
                        printk(" - Already disconnected! ");
                        hostdata->state = S_UNCONNECTED;
                } else
                        hostdata->state = S_CONNECTED;
  
 -              DB(DB_INTR, printk("-%ld", cmd->serial_number))
                    spin_unlock_irqrestore(&hostdata->lock, flags);
                break;
  
@@@ -1636,8 -1637,8 +1636,8 @@@ wd33c93_abort(struct scsi_cmnd * cmd
                        cmd->host_scribble = NULL;
                        cmd->result = DID_ABORT << 16;
                        printk
 -                          ("scsi%d: Abort - removing command %ld from input_Q. ",
 -                           instance->host_no, cmd->serial_number);
 +                          ("scsi%d: Abort - removing command from input_Q. ",
 +                           instance->host_no);
                        enable_irq(cmd->device->host->irq);
                        cmd->scsi_done(cmd);
                        return SUCCESS;
                uchar sr, asr;
                unsigned long timeout;
  
 -              printk("scsi%d: Aborting connected command %ld - ",
 -                     instance->host_no, cmd->serial_number);
 +              printk("scsi%d: Aborting connected command - ",
 +                     instance->host_no);
  
                printk("stopping DMA - ");
                if (hostdata->dma == D_DMA_RUNNING) {
        while (tmp) {
                if (tmp == cmd) {
                        printk
 -                          ("scsi%d: Abort - command %ld found on disconnected_Q - ",
 -                           instance->host_no, cmd->serial_number);
 +                          ("scsi%d: Abort - command found on disconnected_Q - ",
 +                           instance->host_no);
                        printk("Abort SNOOZE. ");
                        enable_irq(cmd->device->host->irq);
                        return FAILED;
@@@ -1842,7 -1843,7 +1842,7 @@@ check_setup_args(char *key, int *flags
   *
   * The original driver used to rely on a fixed sx_table, containing periods
   * for (only) the lower limits of the respective input-clock-frequency ranges
 - * (8-10/12-15/16-20 MHz). Although it seems, that no problems ocurred with
 + * (8-10/12-15/16-20 MHz). Although it seems, that no problems occurred with
   * this setting so far, it might be desirable to adjust the transfer periods
   * closer to the really attached, possibly 25% higher, input-clock, since
   * - the wd33c93 may really use a significant shorter period, than it has
@@@ -2051,8 -2052,7 +2051,7 @@@ wd33c93_init(struct Scsi_Host *instance
        for (i = 0; i < MAX_SETUP_ARGS; i++)
                printk("%s,", setup_args[i]);
        printk("\n");
-       printk("           Version %s - %s, Compiled %s at %s\n",
-              WD33C93_VERSION, WD33C93_DATE, __DATE__, __TIME__);
+       printk("           Version %s - %s\n", WD33C93_VERSION, WD33C93_DATE);
  }
  
  int
@@@ -2132,8 -2132,8 +2131,8 @@@ wd33c93_proc_info(struct Scsi_Host *ins
        bp = buf;
        *bp = '\0';
        if (hd->proc & PR_VERSION) {
-               sprintf(tbuf, "\nVersion %s - %s. Compiled %s %s",
-                       WD33C93_VERSION, WD33C93_DATE, __DATE__, __TIME__);
+               sprintf(tbuf, "\nVersion %s - %s.",
+                       WD33C93_VERSION, WD33C93_DATE);
                strcat(bp, tbuf);
        }
        if (hd->proc & PR_INFO) {
                strcat(bp, "\nconnected:     ");
                if (hd->connected) {
                        cmd = (struct scsi_cmnd *) hd->connected;
 -                      sprintf(tbuf, " %ld-%d:%d(%02x)",
 -                              cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
 +                      sprintf(tbuf, " %d:%d(%02x)",
 +                              cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
                        strcat(bp, tbuf);
                }
        }
                strcat(bp, "\ninput_Q:       ");
                cmd = (struct scsi_cmnd *) hd->input_Q;
                while (cmd) {
 -                      sprintf(tbuf, " %ld-%d:%d(%02x)",
 -                              cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
 +                      sprintf(tbuf, " %d:%d(%02x)",
 +                              cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
                        strcat(bp, tbuf);
                        cmd = (struct scsi_cmnd *) cmd->host_scribble;
                }
                strcat(bp, "\ndisconnected_Q:");
                cmd = (struct scsi_cmnd *) hd->disconnected_Q;
                while (cmd) {
 -                      sprintf(tbuf, " %ld-%d:%d(%02x)",
 -                              cmd->serial_number, cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
 +                      sprintf(tbuf, " %d:%d(%02x)",
 +                              cmd->device->id, cmd->device->lun, cmd->cmnd[0]);
                        strcat(bp, tbuf);
                        cmd = (struct scsi_cmnd *) cmd->host_scribble;
                }
diff --combined drivers/tty/cyclades.c
index bfa05e8018237bede822973a2029c40caf57c014,d6f6dd28b424dd470481d3de9791fc4fa19b0acb..c0e8f2eeb88697b390787d1f210411ae6521c1cd
@@@ -3,6 -3,8 +3,6 @@@
  #undef        Z_EXT_CHARS_IN_BUFFER
  
  /*
 - *  linux/drivers/char/cyclades.c
 - *
   * This file contains the driver for the Cyclades async multiport
   * serial boards.
   *
@@@ -1443,11 -1445,13 +1443,11 @@@ static void cy_shutdown(struct cyclades
  {
        struct cyclades_card *card;
        unsigned long flags;
 -      int channel;
  
        if (!(info->port.flags & ASYNC_INITIALIZED))
                return;
  
        card = info->card;
 -      channel = info->line - card->first_line;
        if (!cy_is_Z(card)) {
                spin_lock_irqsave(&card->card_lock, flags);
  
                spin_unlock_irqrestore(&card->card_lock, flags);
        } else {
  #ifdef CY_DEBUG_OPEN
 +              int channel = info->line - card->first_line;
                printk(KERN_DEBUG "cyc shutdown Z card %d, channel %d, "
                        "base_addr %p\n", card, channel, card->base_addr);
  #endif
@@@ -4096,8 -4099,7 +4096,7 @@@ static int __init cy_init(void
        if (!cy_serial_driver)
                goto err;
  
-       printk(KERN_INFO "Cyclades driver " CY_VERSION " (built %s %s)\n",
-                       __DATE__, __TIME__);
+       printk(KERN_INFO "Cyclades driver " CY_VERSION "\n");
  
        /* Initialize the tty_driver structure */
  
diff --combined drivers/tty/nozomi.c
index b1aecc7bb32a263fbdc75035f65f156e1f4f2549,db16048484c092e44c06b96294659a21786ddfa1..fd347ff34d071dc14972faaa2d3e89ef9260475c
@@@ -61,8 -61,7 +61,7 @@@
  #include <linux/delay.h>
  
  
- #define VERSION_STRING DRIVER_DESC " 2.1d (build date: " \
-                                       __DATE__ " " __TIME__ ")"
+ #define VERSION_STRING DRIVER_DESC " 2.1d"
  
  /*    Macros definitions */
  
@@@ -364,6 -363,8 +363,6 @@@ struct port 
        u8 toggle_ul;
        u16 token_dl;
  
 -      /* mutex to ensure one access patch to this port */
 -      struct mutex tty_sem;
        wait_queue_head_t tty_wait;
        struct async_icount tty_icount;
  
@@@ -1429,8 -1430,8 +1428,8 @@@ static int __devinit nozomi_card_init(s
        }
  
        for (i = PORT_MDM; i < MAX_PORT; i++) {
 -              if (kfifo_alloc(&dc->port[i].fifo_ul,
 -                    FIFO_BUFFER_SIZE_UL, GFP_ATOMIC)) {
 +              if (kfifo_alloc(&dc->port[i].fifo_ul, FIFO_BUFFER_SIZE_UL,
 +                                      GFP_KERNEL)) {
                        dev_err(&pdev->dev,
                                        "Could not allocate kfifo buffer\n");
                        ret = -ENOMEM;
                struct device *tty_dev;
                struct port *port = &dc->port[i];
                port->dc = dc;
 -              mutex_init(&port->tty_sem);
                tty_port_init(&port->port);
                port->port.ops = &noz_tty_port_ops;
                tty_dev = tty_register_device(ntty_driver, dc->index_start + i,
@@@ -1670,7 -1672,7 +1669,7 @@@ static void ntty_hangup(struct tty_stru
  
  /*
   * called when the userspace process writes to the tty (/dev/noz*).
 - * Data is inserted into a fifo, which is then read and transfered to the modem.
 + * Data is inserted into a fifo, which is then read and transferred to the modem.
   */
  static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
                      int count)
        if (!dc || !port)
                return -ENODEV;
  
 -      mutex_lock(&port->tty_sem);
 -
 -      if (unlikely(!port->port.count)) {
 -              DBG1(" ");
 -              goto exit;
 -      }
 -
        rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count);
  
        /* notify card */
        spin_unlock_irqrestore(&dc->spin_mutex, flags);
  
  exit:
 -      mutex_unlock(&port->tty_sem);
        return rval;
  }
  
@@@ -1727,9 -1737,12 +1726,9 @@@ static int ntty_write_room(struct tty_s
        int room = 4096;
        const struct nozomi *dc = get_dc_by_tty(tty);
  
 -      if (dc) {
 -              mutex_lock(&port->tty_sem);
 -              if (port->port.count)
 -                      room = kfifo_avail(&port->fifo_ul);
 -              mutex_unlock(&port->tty_sem);
 -      }
 +      if (dc)
 +              room = kfifo_avail(&port->fifo_ul);
 +
        return room;
  }
  
@@@ -1875,6 -1888,11 +1874,6 @@@ static s32 ntty_chars_in_buffer(struct 
                goto exit_in_buffer;
        }
  
 -      if (unlikely(!port->port.count)) {
 -              dev_err(&dc->pdev->dev, "No tty open?\n");
 -              goto exit_in_buffer;
 -      }
 -
        rval = kfifo_len(&port->fifo_ul);
  
  exit_in_buffer:
diff --combined fs/gfs2/main.c
index cfa327d331942aae3b9ee99497be51110e1a2843,5ebdbee70e80512659dc90fe7e2ead7ebb3f5bc8..c2b34cd2abe0e81f7be6eab08189817507d9f307
@@@ -53,7 -53,6 +53,7 @@@ static void gfs2_init_glock_once(void *
        INIT_LIST_HEAD(&gl->gl_lru);
        INIT_LIST_HEAD(&gl->gl_ail_list);
        atomic_set(&gl->gl_ail_count, 0);
 +      atomic_set(&gl->gl_revokes, 0);
  }
  
  static void gfs2_init_gl_aspace_once(void *foo)
@@@ -146,7 -145,7 +146,7 @@@ static int __init init_gfs2_fs(void
  
        gfs2_register_debugfs();
  
-       printk("GFS2 (built %s %s) installed\n", __DATE__, __TIME__);
+       printk("GFS2 installed\n");
  
        return 0;
  
diff --combined net/atm/lec.c
index 25073b6ef4746cea1197e52f64bba908869d7b29,cb14ddf8f0c0c1b89489207c97253d6407bf2053..ba48daa68c1f19e19427ac96c64b161f271c3e57
@@@ -129,6 -129,7 +129,6 @@@ static struct net_device *dev_lec[MAX_L
  #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
  static void lec_handle_bridge(struct sk_buff *skb, struct net_device *dev)
  {
 -      struct ethhdr *eth;
        char *buff;
        struct lec_priv *priv;
  
         * LE_TOPOLOGY_REQUEST with the same value of Topology Change bit
         * as the Config BPDU has
         */
 -      eth = (struct ethhdr *)skb->data;
        buff = skb->data + skb->dev->hard_header_len;
        if (*buff++ == 0x42 && *buff++ == 0x42 && *buff++ == 0x03) {
                struct sock *sk;
@@@ -1171,13 -1173,14 +1171,13 @@@ static int __init lane_module_init(void
  #endif
  
        register_atm_ioctl(&lane_ioctl_ops);
-       pr_info("lec.c: " __DATE__ " " __TIME__ " initialized\n");
+       pr_info("lec.c: initialized\n");
        return 0;
  }
  
  static void __exit lane_module_cleanup(void)
  {
        int i;
 -      struct lec_priv *priv;
  
        remove_proc_entry("lec", atm_proc_root);
  
  
        for (i = 0; i < MAX_LEC_ITF; i++) {
                if (dev_lec[i] != NULL) {
 -                      priv = netdev_priv(dev_lec[i]);
                        unregister_netdev(dev_lec[i]);
                        free_netdev(dev_lec[i]);
                        dev_lec[i] = NULL;