mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6: Fix common misspellings
This commit is contained in:
Linus Torvalds
commit
42933bac11
2463 changed files with 4249 additions and 4249 deletions
|
|
@ -255,7 +255,7 @@ static int hvc_iucv_write(struct hvc_iucv_private *priv,
|
|||
default:
|
||||
written = -EIO;
|
||||
}
|
||||
/* remove buffer if an error has occured or received data
|
||||
/* remove buffer if an error has occurred or received data
|
||||
* is not correct */
|
||||
if (rc || (rb->mbuf->version != MSG_VERSION) ||
|
||||
(rb->msg.length != MSG_SIZE(rb->mbuf->datalen)))
|
||||
|
|
@ -620,7 +620,7 @@ static void hvc_iucv_hangup(struct hvc_iucv_private *priv)
|
|||
* the index of an struct hvc_iucv_private instance.
|
||||
*
|
||||
* This routine notifies the HVC back-end that a tty hangup (carrier loss,
|
||||
* virtual or otherwise) has occured.
|
||||
* virtual or otherwise) has occurred.
|
||||
* The z/VM IUCV HVC device driver ignores virtual hangups (vhangup())
|
||||
* to keep an existing IUCV communication path established.
|
||||
* (Background: vhangup() is called from user space (by getty or login) to
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/*
|
||||
* vio driver interface to hvc_console.c
|
||||
*
|
||||
* This code was moved here to allow the remaing code to be reused as a
|
||||
* This code was moved here to allow the remaining code to be reused as a
|
||||
* generic polling mode with semi-reliable transport driver core to the
|
||||
* console and tty subsystems.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@
|
|||
* arch/powerepc/include/asm/hvcserver.h
|
||||
*
|
||||
* 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to
|
||||
* prevent possible lockup with realtime scheduling as similarily pointed out by
|
||||
* prevent possible lockup with realtime scheduling as similarly pointed out by
|
||||
* akpm in hvc_console. Changed resulted in the removal of hvcs_final_close()
|
||||
* to reorder cleanup operations and prevent discarding of pending data during
|
||||
* an hvcs_close(). Removed spinlock protection of hvcs_struct data members in
|
||||
|
|
@ -581,7 +581,7 @@ static void hvcs_try_write(struct hvcs_struct *hvcsd)
|
|||
/*
|
||||
* We are still obligated to deliver the data to the
|
||||
* hypervisor even if the tty has been closed because
|
||||
* we commited to delivering it. But don't try to wake
|
||||
* we committed to delivering it. But don't try to wake
|
||||
* a non-existent tty.
|
||||
*/
|
||||
if (tty) {
|
||||
|
|
@ -1349,7 +1349,7 @@ static int hvcs_write(struct tty_struct *tty,
|
|||
spin_lock_irqsave(&hvcsd->lock, flags);
|
||||
|
||||
/*
|
||||
* Somehow an open succedded but the device was removed or the
|
||||
* Somehow an open succeeded but the device was removed or the
|
||||
* connection terminated between the vty-server and partner vty during
|
||||
* the middle of a write operation? This is a crummy place to do this
|
||||
* but we want to keep it all in the spinlock.
|
||||
|
|
@ -1420,7 +1420,7 @@ static int hvcs_write(struct tty_struct *tty,
|
|||
}
|
||||
|
||||
/*
|
||||
* This is really asking how much can we guarentee that we can send or that we
|
||||
* This is really asking how much can we guarantee that we can send or that we
|
||||
* absolutely WILL BUFFER if we can't send it. This driver MUST honor the
|
||||
* return value, hence the reason for hvcs_struct buffering.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@
|
|||
#define MOXA_MUST_IIR_RTO 0x0C
|
||||
#define MOXA_MUST_IIR_LSR 0x06
|
||||
|
||||
/* recieved Xon/Xoff or specical interrupt pending */
|
||||
/* received Xon/Xoff or specical interrupt pending */
|
||||
#define MOXA_MUST_IIR_XSC 0x10
|
||||
|
||||
/* RTS/CTS change state interrupt pending */
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ module_param(debug, int, 0600);
|
|||
#endif
|
||||
|
||||
/*
|
||||
* Semi-arbitary buffer size limits. 0710 is normally run with 32-64 byte
|
||||
* Semi-arbitrary buffer size limits. 0710 is normally run with 32-64 byte
|
||||
* limits so this is plenty
|
||||
*/
|
||||
#define MAX_MRU 512
|
||||
|
|
@ -82,7 +82,7 @@ module_param(debug, int, 0600);
|
|||
|
||||
/*
|
||||
* Each block of data we have queued to go out is in the form of
|
||||
* a gsm_msg which holds everything we need in a link layer independant
|
||||
* a gsm_msg which holds everything we need in a link layer independent
|
||||
* format
|
||||
*/
|
||||
|
||||
|
|
@ -1193,8 +1193,8 @@ static void gsm_control_message(struct gsm_mux *gsm, unsigned int command,
|
|||
break;
|
||||
/* Optional unsupported commands */
|
||||
case CMD_PN: /* Parameter negotiation */
|
||||
case CMD_RPN: /* Remote port negotation */
|
||||
case CMD_SNC: /* Service negotation command */
|
||||
case CMD_RPN: /* Remote port negotiation */
|
||||
case CMD_SNC: /* Service negotiation command */
|
||||
default:
|
||||
/* Reply to bad commands with an NSC */
|
||||
buf[0] = command;
|
||||
|
|
@ -2026,7 +2026,7 @@ EXPORT_SYMBOL_GPL(gsm_activate_mux);
|
|||
* @mux: mux to free
|
||||
*
|
||||
* Dispose of allocated resources for a dead mux. No refcounting
|
||||
* at present so the mux must be truely dead.
|
||||
* at present so the mux must be truly dead.
|
||||
*/
|
||||
void gsm_free_mux(struct gsm_mux *gsm)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1673,7 +1673,7 @@ static void ntty_hangup(struct tty_struct *tty)
|
|||
|
||||
/*
|
||||
* 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)
|
||||
|
|
|
|||
|
|
@ -2060,7 +2060,7 @@ static __init int register_PCI(int i, struct pci_dev *dev)
|
|||
sClockPrescale = 0x19;
|
||||
rp_baud_base[i] = 230400;
|
||||
} else {
|
||||
/* mod 4 (devide by 5) prescale */
|
||||
/* mod 4 (divide by 5) prescale */
|
||||
sClockPrescale = 0x14;
|
||||
rp_baud_base[i] = 460800;
|
||||
}
|
||||
|
|
@ -2183,7 +2183,7 @@ static int __init init_ISA(int i)
|
|||
sClockPrescale = 0x19; /* mod 9 (divide by 10) prescale */
|
||||
rp_baud_base[i] = 230400;
|
||||
} else {
|
||||
sClockPrescale = 0x14; /* mod 4 (devide by 5) prescale */
|
||||
sClockPrescale = 0x14; /* mod 4 (divide by 5) prescale */
|
||||
rp_baud_base[i] = 460800;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1629,7 +1629,7 @@ static irqreturn_t serial8250_interrupt(int irq, void *dev_id)
|
|||
up->port.iotype == UPIO_DWAPB32) &&
|
||||
(iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
|
||||
/* The DesignWare APB UART has an Busy Detect (0x07)
|
||||
* interrupt meaning an LCR write attempt occured while the
|
||||
* interrupt meaning an LCR write attempt occurred while the
|
||||
* UART was busy. The interrupt must be cleared by reading
|
||||
* the UART status register (USR) and the LCR re-written. */
|
||||
unsigned int status;
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ static void __devexit sbs_exit(struct pci_dev *dev)
|
|||
/*
|
||||
* SIIG serial cards have an PCI interface chip which also controls
|
||||
* the UART clocking frequency. Each UART can be clocked independently
|
||||
* (except cards equiped with 4 UARTs) and initial clocking settings
|
||||
* (except cards equipped with 4 UARTs) and initial clocking settings
|
||||
* are stored in the EEPROM chip. It can cause problems because this
|
||||
* version of serial driver doesn't support differently clocked UART's
|
||||
* on single PCI card. To prevent this, initialization functions set
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@ static bool pl011_dma_tx_irq(struct uart_amba_port *uap)
|
|||
|
||||
/*
|
||||
* We don't have a TX buffer queued, so try to queue one.
|
||||
* If we succesfully queued a buffer, mask the TX IRQ.
|
||||
* If we successfully queued a buffer, mask the TX IRQ.
|
||||
*/
|
||||
if (pl011_dma_tx_refill(uap) > 0) {
|
||||
uap->im &= ~UART011_TXIM;
|
||||
|
|
|
|||
|
|
@ -1248,7 +1248,7 @@ static void icom_set_termios(struct uart_port *port,
|
|||
}
|
||||
}
|
||||
|
||||
/* Enable Transmitter and Reciever */
|
||||
/* Enable Transmitter and Receiver */
|
||||
offset =
|
||||
(unsigned long) &ICOM_PORT->statStg->rcv[0] -
|
||||
(unsigned long) ICOM_PORT->statStg;
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
#define URXD_FRMERR (1<<12)
|
||||
#define URXD_BRK (1<<11)
|
||||
#define URXD_PRERR (1<<10)
|
||||
#define UCR1_ADEN (1<<15) /* Auto dectect interrupt */
|
||||
#define UCR1_ADEN (1<<15) /* Auto detect interrupt */
|
||||
#define UCR1_ADBR (1<<14) /* Auto detect baud rate */
|
||||
#define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */
|
||||
#define UCR1_IDEN (1<<12) /* Idle condition interrupt */
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
|
|||
* be nice to transmit console writes just like we normally would for
|
||||
* a TTY line. (ie. buffered and TX interrupt driven). That is not
|
||||
* easy because console writes cannot sleep. One solution might be
|
||||
* to poll on enough port->xmit space becomming free. -DaveM
|
||||
* to poll on enough port->xmit space becoming free. -DaveM
|
||||
*/
|
||||
if (!(status & Tx_BUF_EMP))
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -273,7 +273,7 @@ struct neo_uart_struct {
|
|||
u8 fctr; /* WR FCTR - Feature Control Reg */
|
||||
u8 efr; /* WR EFR - Enhanced Function Reg */
|
||||
u8 tfifo; /* WR TXCNT/TXTRG - Transmit FIFO Reg */
|
||||
u8 rfifo; /* WR RXCNT/RXTRG - Recieve FIFO Reg */
|
||||
u8 rfifo; /* WR RXCNT/RXTRG - Receive FIFO Reg */
|
||||
u8 xoffchar1; /* WR XOFF 1 - XOff Character 1 Reg */
|
||||
u8 xoffchar2; /* WR XOFF 2 - XOff Character 2 Reg */
|
||||
u8 xonchar1; /* WR XON 1 - Xon Character 1 Reg */
|
||||
|
|
|
|||
|
|
@ -381,7 +381,7 @@ static void neo_copy_data_from_uart_to_queue(struct jsm_channel *ch)
|
|||
/* Copy data from uart to the queue */
|
||||
memcpy_fromio(ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst, n);
|
||||
/*
|
||||
* Since RX_FIFO_DATA_ERROR was 0, we are guarenteed
|
||||
* Since RX_FIFO_DATA_ERROR was 0, we are guaranteed
|
||||
* that all the data currently in the FIFO is free of
|
||||
* breaks and parity/frame/orun errors.
|
||||
*/
|
||||
|
|
@ -1210,7 +1210,7 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
|
|||
* Why would I check EVERY possibility of type of
|
||||
* interrupt, when we know its TXRDY???
|
||||
* Becuz for some reason, even tho we got triggered for TXRDY,
|
||||
* it seems to be occassionally wrong. Instead of TX, which
|
||||
* it seems to be occasionally wrong. Instead of TX, which
|
||||
* it should be, I was getting things like RXDY too. Weird.
|
||||
*/
|
||||
neo_parse_isr(brd, port);
|
||||
|
|
|
|||
|
|
@ -369,7 +369,7 @@ struct max3107_port {
|
|||
struct spi_device *spi;
|
||||
|
||||
#if defined(CONFIG_GPIOLIB)
|
||||
/* GPIO chip stucture */
|
||||
/* GPIO chip structure */
|
||||
struct gpio_chip chip;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
* 1 word. If SPI master controller doesn't support sclk frequency change,
|
||||
* then the char need be sent out one by one with some delay
|
||||
*
|
||||
* 2. Currently only RX availabe interrrupt is used, no need for waiting TXE
|
||||
* 2. Currently only RX available interrrupt is used, no need for waiting TXE
|
||||
* interrupt for a low speed UART device
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#define WC_IRQ_MASK (0xF << 8)
|
||||
#define WC_TXE_IRQ_ENABLE (1 << 11) /* TX empty irq */
|
||||
#define WC_RXA_IRQ_ENABLE (1 << 10) /* RX availabe irq */
|
||||
#define WC_RXA_IRQ_ENABLE (1 << 10) /* RX available irq */
|
||||
#define WC_PAR_HIGH_IRQ_ENABLE (1 << 9)
|
||||
#define WC_REC_ACT_IRQ_ENABLE (1 << 8)
|
||||
|
||||
|
|
|
|||
|
|
@ -495,7 +495,7 @@ static void msm_hs_pm(struct uart_port *uport, unsigned int state,
|
|||
*
|
||||
* Interrupts should be disabled before we are called, as
|
||||
* we modify Set Baud rate
|
||||
* Set receive stale interrupt level, dependant on Bit Rate
|
||||
* Set receive stale interrupt level, dependent on Bit Rate
|
||||
* Goal is to have around 8 ms before indicate stale.
|
||||
* roundup (((Bit Rate * .008) / 10) + 1
|
||||
*/
|
||||
|
|
@ -1350,7 +1350,7 @@ static irqreturn_t msm_hs_rx_wakeup_isr(int irq, void *dev)
|
|||
|
||||
spin_lock_irqsave(&uport->lock, flags);
|
||||
if (msm_uport->clk_state == MSM_HS_CLK_OFF) {
|
||||
/* ignore the first irq - it is a pending irq that occured
|
||||
/* ignore the first irq - it is a pending irq that occurred
|
||||
* before enable_irq() */
|
||||
if (msm_uport->rx_wakeup.ignore)
|
||||
msm_uport->rx_wakeup.ignore = 0;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Note: This driver is made seperate from 8250 driver as we cannot
|
||||
* Note: This driver is made separate from 8250 driver as we cannot
|
||||
* over load 8250 driver with omap platform specific configuration for
|
||||
* features like DMA, it makes easier to implement features like DMA and
|
||||
* hardware flow control and software flow control configuration with
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ static struct tty_struct *pmz_receive_chars(struct uart_pmac_port *uap)
|
|||
* When that happens, I disable the receive side of the driver.
|
||||
* Note that what I've been experiencing is a real irq loop where
|
||||
* I'm getting flooded regardless of the actual port speed.
|
||||
* Something stange is going on with the HW
|
||||
* Something strange is going on with the HW
|
||||
*/
|
||||
if ((++loops) > 1000)
|
||||
goto flood;
|
||||
|
|
@ -396,7 +396,7 @@ static void pmz_transmit_chars(struct uart_pmac_port *uap)
|
|||
* be nice to transmit console writes just like we normally would for
|
||||
* a TTY line. (ie. buffered and TX interrupt driven). That is not
|
||||
* easy because console writes cannot sleep. One solution might be
|
||||
* to poll on enough port->xmit space becomming free. -DaveM
|
||||
* to poll on enough port->xmit space becoming free. -DaveM
|
||||
*/
|
||||
if (!(status & Tx_BUF_EMP))
|
||||
return;
|
||||
|
|
@ -809,7 +809,7 @@ static int pmz_set_scc_power(struct uart_pmac_port *uap, int state)
|
|||
#endif /* !CONFIG_PPC_PMAC */
|
||||
|
||||
/*
|
||||
* FixZeroBug....Works around a bug in the SCC receving channel.
|
||||
* FixZeroBug....Works around a bug in the SCC receiving channel.
|
||||
* Inspired from Darwin code, 15 Sept. 2000 -DanM
|
||||
*
|
||||
* The following sequence prevents a problem that is seen with O'Hare ASICs
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
#define tx_enabled(port) ((port)->unused[0])
|
||||
#define rx_enabled(port) ((port)->unused[1])
|
||||
|
||||
/* flag to ignore all characters comming in */
|
||||
/* flag to ignore all characters coming in */
|
||||
#define RXSTAT_DUMMY_READ (0x10000000)
|
||||
|
||||
static inline struct s3c24xx_uart_port *to_ourport(struct uart_port *port)
|
||||
|
|
@ -291,7 +291,7 @@ static irqreturn_t s3c24xx_serial_tx_chars(int irq, void *id)
|
|||
goto out;
|
||||
}
|
||||
|
||||
/* if there isnt anything more to transmit, or the uart is now
|
||||
/* if there isn't anything more to transmit, or the uart is now
|
||||
* stopped, disable the uart and exit
|
||||
*/
|
||||
|
||||
|
|
|
|||
|
|
@ -812,7 +812,7 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
|
|||
}
|
||||
|
||||
/*
|
||||
* Here we define a transistion notifier so that we can update all of our
|
||||
* Here we define a transition notifier so that we can update all of our
|
||||
* ports' baud rate when the peripheral clock changes.
|
||||
*/
|
||||
static int sci_notifier(struct notifier_block *self,
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ static struct sn_sal_ops intr_ops = {
|
|||
};
|
||||
|
||||
/* the console does output in two distinctly different ways:
|
||||
* synchronous (raw) and asynchronous (buffered). initally, early_printk
|
||||
* synchronous (raw) and asynchronous (buffered). initially, early_printk
|
||||
* does synchronous output. any data written goes directly to the SAL
|
||||
* to be output (incidentally, it is internally buffered by the SAL)
|
||||
* after interrupts and timers are initialized and available for use,
|
||||
|
|
@ -481,7 +481,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags)
|
|||
while (port->sc_ops->sal_input_pending()) {
|
||||
ch = port->sc_ops->sal_getc();
|
||||
if (ch < 0) {
|
||||
printk(KERN_ERR "sn_console: An error occured while "
|
||||
printk(KERN_ERR "sn_console: An error occurred while "
|
||||
"obtaining data from the console (0x%0x)\n", ch);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -474,7 +474,7 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
|
|||
* be nice to transmit console writes just like we normally would for
|
||||
* a TTY line. (ie. buffered and TX interrupt driven). That is not
|
||||
* easy because console writes cannot sleep. One solution might be
|
||||
* to poll on enough port->xmit space becomming free. -DaveM
|
||||
* to poll on enough port->xmit space becoming free. -DaveM
|
||||
*/
|
||||
if (!(status & Tx_BUF_EMP))
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -4072,7 +4072,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
|
|||
|
||||
if ( request_irq(info->irq_level,mgsl_interrupt,info->irq_flags,
|
||||
info->device_name, info ) < 0 ) {
|
||||
printk( "%s(%d):Cant request interrupt on device %s IRQ=%d\n",
|
||||
printk( "%s(%d):Can't request interrupt on device %s IRQ=%d\n",
|
||||
__FILE__,__LINE__,info->device_name, info->irq_level );
|
||||
goto errout;
|
||||
}
|
||||
|
|
@ -4095,7 +4095,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
|
|||
info->memory_base = ioremap_nocache(info->phys_memory_base,
|
||||
0x40000);
|
||||
if (!info->memory_base) {
|
||||
printk( "%s(%d):Cant map shared memory on device %s MemAddr=%08X\n",
|
||||
printk( "%s(%d):Can't map shared memory on device %s MemAddr=%08X\n",
|
||||
__FILE__,__LINE__,info->device_name, info->phys_memory_base );
|
||||
goto errout;
|
||||
}
|
||||
|
|
@ -4109,7 +4109,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
|
|||
info->lcr_base = ioremap_nocache(info->phys_lcr_base,
|
||||
PAGE_SIZE);
|
||||
if (!info->lcr_base) {
|
||||
printk( "%s(%d):Cant map LCR memory on device %s MemAddr=%08X\n",
|
||||
printk( "%s(%d):Can't map LCR memory on device %s MemAddr=%08X\n",
|
||||
__FILE__,__LINE__,info->device_name, info->phys_lcr_base );
|
||||
goto errout;
|
||||
}
|
||||
|
|
@ -4119,7 +4119,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
|
|||
/* claim DMA channel */
|
||||
|
||||
if (request_dma(info->dma_level,info->device_name) < 0){
|
||||
printk( "%s(%d):Cant request DMA channel on device %s DMA=%d\n",
|
||||
printk( "%s(%d):Can't request DMA channel on device %s DMA=%d\n",
|
||||
__FILE__,__LINE__,info->device_name, info->dma_level );
|
||||
mgsl_release_resources( info );
|
||||
return -ENODEV;
|
||||
|
|
@ -4132,7 +4132,7 @@ static int mgsl_claim_resources(struct mgsl_struct *info)
|
|||
}
|
||||
|
||||
if ( mgsl_allocate_dma_buffers(info) < 0 ) {
|
||||
printk( "%s(%d):Cant allocate DMA buffers on device %s DMA=%d\n",
|
||||
printk( "%s(%d):Can't allocate DMA buffers on device %s DMA=%d\n",
|
||||
__FILE__,__LINE__,info->device_name, info->dma_level );
|
||||
goto errout;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3491,7 +3491,7 @@ static int claim_resources(struct slgt_info *info)
|
|||
|
||||
info->reg_addr = ioremap_nocache(info->phys_reg_addr, SLGT_REG_SIZE);
|
||||
if (!info->reg_addr) {
|
||||
DBGERR(("%s cant map device registers, addr=%08X\n",
|
||||
DBGERR(("%s can't map device registers, addr=%08X\n",
|
||||
info->device_name, info->phys_reg_addr));
|
||||
info->init_error = DiagStatus_CantAssignPciResources;
|
||||
goto errout;
|
||||
|
|
|
|||
|
|
@ -3595,7 +3595,7 @@ static int claim_resources(SLMP_INFO *info)
|
|||
info->memory_base = ioremap_nocache(info->phys_memory_base,
|
||||
SCA_MEM_SIZE);
|
||||
if (!info->memory_base) {
|
||||
printk( "%s(%d):%s Cant map shared memory, MemAddr=%08X\n",
|
||||
printk( "%s(%d):%s Can't map shared memory, MemAddr=%08X\n",
|
||||
__FILE__,__LINE__,info->device_name, info->phys_memory_base );
|
||||
info->init_error = DiagStatus_CantAssignPciResources;
|
||||
goto errout;
|
||||
|
|
@ -3603,7 +3603,7 @@ static int claim_resources(SLMP_INFO *info)
|
|||
|
||||
info->lcr_base = ioremap_nocache(info->phys_lcr_base, PAGE_SIZE);
|
||||
if (!info->lcr_base) {
|
||||
printk( "%s(%d):%s Cant map LCR memory, MemAddr=%08X\n",
|
||||
printk( "%s(%d):%s Can't map LCR memory, MemAddr=%08X\n",
|
||||
__FILE__,__LINE__,info->device_name, info->phys_lcr_base );
|
||||
info->init_error = DiagStatus_CantAssignPciResources;
|
||||
goto errout;
|
||||
|
|
@ -3612,7 +3612,7 @@ static int claim_resources(SLMP_INFO *info)
|
|||
|
||||
info->sca_base = ioremap_nocache(info->phys_sca_base, PAGE_SIZE);
|
||||
if (!info->sca_base) {
|
||||
printk( "%s(%d):%s Cant map SCA memory, MemAddr=%08X\n",
|
||||
printk( "%s(%d):%s Can't map SCA memory, MemAddr=%08X\n",
|
||||
__FILE__,__LINE__,info->device_name, info->phys_sca_base );
|
||||
info->init_error = DiagStatus_CantAssignPciResources;
|
||||
goto errout;
|
||||
|
|
@ -3622,7 +3622,7 @@ static int claim_resources(SLMP_INFO *info)
|
|||
info->statctrl_base = ioremap_nocache(info->phys_statctrl_base,
|
||||
PAGE_SIZE);
|
||||
if (!info->statctrl_base) {
|
||||
printk( "%s(%d):%s Cant map SCA Status/Control memory, MemAddr=%08X\n",
|
||||
printk( "%s(%d):%s Can't map SCA Status/Control memory, MemAddr=%08X\n",
|
||||
__FILE__,__LINE__,info->device_name, info->phys_statctrl_base );
|
||||
info->init_error = DiagStatus_CantAssignPciResources;
|
||||
goto errout;
|
||||
|
|
@ -3869,7 +3869,7 @@ static void device_init(int adapter_num, struct pci_dev *pdev)
|
|||
port_array[0]->irq_flags,
|
||||
port_array[0]->device_name,
|
||||
port_array[0]) < 0 ) {
|
||||
printk( "%s(%d):%s Cant request interrupt, IRQ=%d\n",
|
||||
printk( "%s(%d):%s Can't request interrupt, IRQ=%d\n",
|
||||
__FILE__,__LINE__,
|
||||
port_array[0]->device_name,
|
||||
port_array[0]->irq_level );
|
||||
|
|
|
|||
|
|
@ -2134,7 +2134,7 @@ done:
|
|||
* actually has driver level meaning and triggers a VC resize.
|
||||
*
|
||||
* Locking:
|
||||
* Driver dependant. The default do_resize method takes the
|
||||
* Driver dependent. The default do_resize method takes the
|
||||
* tty termios mutex and ctrl_lock. The console takes its own lock
|
||||
* then calls into the default method.
|
||||
*/
|
||||
|
|
@ -2155,7 +2155,7 @@ static int tiocswinsz(struct tty_struct *tty, struct winsize __user *arg)
|
|||
* tioccons - allow admin to move logical console
|
||||
* @file: the file to become console
|
||||
*
|
||||
* Allow the adminstrator to move the redirected console device
|
||||
* Allow the administrator to move the redirected console device
|
||||
*
|
||||
* Locking: uses redirect_lock to guard the redirect information
|
||||
*/
|
||||
|
|
@ -2290,7 +2290,7 @@ EXPORT_SYMBOL_GPL(tty_get_pgrp);
|
|||
/**
|
||||
* tiocgpgrp - get process group
|
||||
* @tty: tty passed by user
|
||||
* @real_tty: tty side of the tty pased by the user if a pty else the tty
|
||||
* @real_tty: tty side of the tty passed by the user if a pty else the tty
|
||||
* @p: returned pid
|
||||
*
|
||||
* Obtain the process group of the tty. If there is no process group
|
||||
|
|
@ -2367,7 +2367,7 @@ out_unlock:
|
|||
/**
|
||||
* tiocgsid - get session id
|
||||
* @tty: tty passed by user
|
||||
* @real_tty: tty side of the tty pased by the user if a pty else the tty
|
||||
* @real_tty: tty side of the tty passed by the user if a pty else the tty
|
||||
* @p: pointer to returned session id
|
||||
*
|
||||
* Obtain the session id of the tty. If there is no session
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@ speed_t tty_termios_baud_rate(struct ktermios *termios)
|
|||
cbaud = termios->c_cflag & CBAUD;
|
||||
|
||||
#ifdef BOTHER
|
||||
/* Magic token for arbitary speed via c_ispeed/c_ospeed */
|
||||
/* Magic token for arbitrary speed via c_ispeed/c_ospeed */
|
||||
if (cbaud == BOTHER)
|
||||
return termios->c_ospeed;
|
||||
#endif
|
||||
|
|
@ -283,7 +283,7 @@ speed_t tty_termios_input_baud_rate(struct ktermios *termios)
|
|||
if (cbaud == B0)
|
||||
return tty_termios_baud_rate(termios);
|
||||
|
||||
/* Magic token for arbitary speed via c_ispeed*/
|
||||
/* Magic token for arbitrary speed via c_ispeed*/
|
||||
if (cbaud == BOTHER)
|
||||
return termios->c_ispeed;
|
||||
|
||||
|
|
@ -449,7 +449,7 @@ EXPORT_SYMBOL(tty_get_baud_rate);
|
|||
* @new: New termios
|
||||
* @old: Old termios
|
||||
*
|
||||
* Propogate the hardware specific terminal setting bits from
|
||||
* Propagate the hardware specific terminal setting bits from
|
||||
* the old termios structure to the new one. This is used in cases
|
||||
* where the hardware does not support reconfiguration or as a helper
|
||||
* in some cases where only minimal reconfiguration is supported
|
||||
|
|
|
|||
|
|
@ -3963,7 +3963,7 @@ void reset_palette(struct vc_data *vc)
|
|||
* of 32 pixels. Userspace fontdata is stored with 32 bytes (shorts/ints,
|
||||
* depending on width) reserved for each character which is kinda wasty, but
|
||||
* this is done in order to maintain compatibility with the EGA/VGA fonts. It
|
||||
* is upto the actual low-level console-driver convert data into its favorite
|
||||
* is up to the actual low-level console-driver convert data into its favorite
|
||||
* format (maybe we should add a `fontoffset' field to the `display'
|
||||
* structure so we won't have to convert the fontdata all the time.
|
||||
* /Jes
|
||||
|
|
|
|||
Loading…
Reference in a new issue