Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Ensure 8250_pci quirks are not marked __devinit [SERIAL] Convert fifosize to an unsigned int
This commit is contained in:
commit
075395d228
|
@ -134,7 +134,7 @@ afavlab_setup(struct serial_private *priv, struct pciserial_board *board,
|
||||||
* and Keystone have one Diva chip with 3 UARTs. Some later machines have
|
* and Keystone have one Diva chip with 3 UARTs. Some later machines have
|
||||||
* one Diva chip, but it has been expanded to 5 UARTs.
|
* one Diva chip, but it has been expanded to 5 UARTs.
|
||||||
*/
|
*/
|
||||||
static int __devinit pci_hp_diva_init(struct pci_dev *dev)
|
static int pci_hp_diva_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
int rc = 0;
|
int rc = 0;
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ pci_hp_diva_setup(struct serial_private *priv, struct pciserial_board *board,
|
||||||
/*
|
/*
|
||||||
* Added for EKF Intel i960 serial boards
|
* Added for EKF Intel i960 serial boards
|
||||||
*/
|
*/
|
||||||
static int __devinit pci_inteli960ni_init(struct pci_dev *dev)
|
static int pci_inteli960ni_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
unsigned long oldval;
|
unsigned long oldval;
|
||||||
|
|
||||||
|
@ -216,7 +216,7 @@ static int __devinit pci_inteli960ni_init(struct pci_dev *dev)
|
||||||
* seems to be mainly needed on card using the PLX which also use I/O
|
* seems to be mainly needed on card using the PLX which also use I/O
|
||||||
* mapped memory.
|
* mapped memory.
|
||||||
*/
|
*/
|
||||||
static int __devinit pci_plx9050_init(struct pci_dev *dev)
|
static int pci_plx9050_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
u8 irq_config;
|
u8 irq_config;
|
||||||
void __iomem *p;
|
void __iomem *p;
|
||||||
|
@ -314,7 +314,7 @@ sbs_setup(struct serial_private *priv, struct pciserial_board *board,
|
||||||
/* global control register offset for SBS PMC-OctalPro */
|
/* global control register offset for SBS PMC-OctalPro */
|
||||||
#define OCT_REG_CR_OFF 0x500
|
#define OCT_REG_CR_OFF 0x500
|
||||||
|
|
||||||
static int __devinit sbs_init(struct pci_dev *dev)
|
static int sbs_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
u8 __iomem *p;
|
u8 __iomem *p;
|
||||||
|
|
||||||
|
@ -493,7 +493,7 @@ static const struct timedia_struct {
|
||||||
{ 0, NULL }
|
{ 0, NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __devinit pci_timedia_init(struct pci_dev *dev)
|
static int pci_timedia_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
unsigned short *ids;
|
unsigned short *ids;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
@ -566,13 +566,13 @@ titan_400l_800l_setup(struct serial_private *priv,
|
||||||
return setup_port(priv, port, bar, offset, board->reg_shift);
|
return setup_port(priv, port, bar, offset, board->reg_shift);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit pci_xircom_init(struct pci_dev *dev)
|
static int pci_xircom_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
msleep(100);
|
msleep(100);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devinit pci_netmos_init(struct pci_dev *dev)
|
static int pci_netmos_init(struct pci_dev *dev)
|
||||||
{
|
{
|
||||||
/* subdevice 0x00PS means <P> parallel, <S> serial */
|
/* subdevice 0x00PS means <P> parallel, <S> serial */
|
||||||
unsigned int num_serial = dev->subsystem_device & 0xf;
|
unsigned int num_serial = dev->subsystem_device & 0xf;
|
||||||
|
@ -622,7 +622,7 @@ pci_default_setup(struct serial_private *priv, struct pciserial_board *board,
|
||||||
*/
|
*/
|
||||||
static struct pci_serial_quirk pci_serial_quirks[] = {
|
static struct pci_serial_quirk pci_serial_quirks[] = {
|
||||||
/*
|
/*
|
||||||
* AFAVLAB cards.
|
* AFAVLAB cards - these may be called via parport_serial
|
||||||
* It is not clear whether this applies to all products.
|
* It is not clear whether this applies to all products.
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
|
@ -754,7 +754,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
|
||||||
.exit = __devexit_p(sbs_exit),
|
.exit = __devexit_p(sbs_exit),
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
* SIIG cards.
|
* SIIG cards - these may be called via parport_serial
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
.vendor = PCI_VENDOR_ID_SIIG,
|
.vendor = PCI_VENDOR_ID_SIIG,
|
||||||
|
@ -811,7 +811,7 @@ static struct pci_serial_quirk pci_serial_quirks[] = {
|
||||||
.setup = pci_default_setup,
|
.setup = pci_default_setup,
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
* Netmos cards
|
* Netmos cards - these may be called via parport_serial
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
.vendor = PCI_VENDOR_ID_NETMOS,
|
.vendor = PCI_VENDOR_ID_NETMOS,
|
||||||
|
|
|
@ -726,8 +726,7 @@ mpc52xx_uart_probe(struct platform_device *dev)
|
||||||
|
|
||||||
spin_lock_init(&port->lock);
|
spin_lock_init(&port->lock);
|
||||||
port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
|
port->uartclk = __res.bi_ipbfreq / 2; /* Look at CTLR doc */
|
||||||
port->fifosize = 255; /* Should be 512 ! But it can't be */
|
port->fifosize = 512;
|
||||||
/* stored in a unsigned char */
|
|
||||||
port->iotype = UPIO_MEM;
|
port->iotype = UPIO_MEM;
|
||||||
port->flags = UPF_BOOT_AUTOCONF |
|
port->flags = UPF_BOOT_AUTOCONF |
|
||||||
( uart_console(port) ? 0 : UPF_IOREMAP );
|
( uart_console(port) ? 0 : UPF_IOREMAP );
|
||||||
|
|
|
@ -696,7 +696,8 @@ static int uart_set_info(struct uart_state *state,
|
||||||
(new_serial.baud_base != port->uartclk / 16) ||
|
(new_serial.baud_base != port->uartclk / 16) ||
|
||||||
(close_delay != state->close_delay) ||
|
(close_delay != state->close_delay) ||
|
||||||
(closing_wait != state->closing_wait) ||
|
(closing_wait != state->closing_wait) ||
|
||||||
(new_serial.xmit_fifo_size != port->fifosize) ||
|
(new_serial.xmit_fifo_size &&
|
||||||
|
new_serial.xmit_fifo_size != port->fifosize) ||
|
||||||
(((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
|
(((new_flags ^ old_flags) & ~UPF_USR_MASK) != 0))
|
||||||
goto exit;
|
goto exit;
|
||||||
port->flags = ((port->flags & ~UPF_USR_MASK) |
|
port->flags = ((port->flags & ~UPF_USR_MASK) |
|
||||||
|
@ -801,7 +802,8 @@ static int uart_set_info(struct uart_state *state,
|
||||||
port->custom_divisor = new_serial.custom_divisor;
|
port->custom_divisor = new_serial.custom_divisor;
|
||||||
state->close_delay = close_delay;
|
state->close_delay = close_delay;
|
||||||
state->closing_wait = closing_wait;
|
state->closing_wait = closing_wait;
|
||||||
port->fifosize = new_serial.xmit_fifo_size;
|
if (new_serial.xmit_fifo_size)
|
||||||
|
port->fifosize = new_serial.xmit_fifo_size;
|
||||||
if (state->info->tty)
|
if (state->info->tty)
|
||||||
state->info->tty->low_latency =
|
state->info->tty->low_latency =
|
||||||
(port->flags & UPF_LOW_LATENCY) ? 1 : 0;
|
(port->flags & UPF_LOW_LATENCY) ? 1 : 0;
|
||||||
|
|
|
@ -216,10 +216,11 @@ struct uart_port {
|
||||||
unsigned char __iomem *membase; /* read/write[bwl] */
|
unsigned char __iomem *membase; /* read/write[bwl] */
|
||||||
unsigned int irq; /* irq number */
|
unsigned int irq; /* irq number */
|
||||||
unsigned int uartclk; /* base uart clock */
|
unsigned int uartclk; /* base uart clock */
|
||||||
unsigned char fifosize; /* tx fifo size */
|
unsigned int fifosize; /* tx fifo size */
|
||||||
unsigned char x_char; /* xon/xoff char */
|
unsigned char x_char; /* xon/xoff char */
|
||||||
unsigned char regshift; /* reg offset shift */
|
unsigned char regshift; /* reg offset shift */
|
||||||
unsigned char iotype; /* io access style */
|
unsigned char iotype; /* io access style */
|
||||||
|
unsigned char unused1;
|
||||||
|
|
||||||
#define UPIO_PORT (0)
|
#define UPIO_PORT (0)
|
||||||
#define UPIO_HUB6 (1)
|
#define UPIO_HUB6 (1)
|
||||||
|
|
Loading…
Reference in New Issue