|
@@ -105,7 +105,7 @@ static const struct pci_device_id icom_pci_table[] = {
|
|
|
{}
|
|
|
};
|
|
|
|
|
|
-struct lookup_proc_table start_proc[4] = {
|
|
|
+static struct lookup_proc_table start_proc[4] = {
|
|
|
{NULL, ICOM_CONTROL_START_A},
|
|
|
{NULL, ICOM_CONTROL_START_B},
|
|
|
{NULL, ICOM_CONTROL_START_C},
|
|
@@ -113,14 +113,14 @@ struct lookup_proc_table start_proc[4] = {
|
|
|
};
|
|
|
|
|
|
|
|
|
-struct lookup_proc_table stop_proc[4] = {
|
|
|
+static struct lookup_proc_table stop_proc[4] = {
|
|
|
{NULL, ICOM_CONTROL_STOP_A},
|
|
|
{NULL, ICOM_CONTROL_STOP_B},
|
|
|
{NULL, ICOM_CONTROL_STOP_C},
|
|
|
{NULL, ICOM_CONTROL_STOP_D}
|
|
|
};
|
|
|
|
|
|
-struct lookup_int_table int_mask_tbl[4] = {
|
|
|
+static struct lookup_int_table int_mask_tbl[4] = {
|
|
|
{NULL, ICOM_INT_MASK_PRC_A},
|
|
|
{NULL, ICOM_INT_MASK_PRC_B},
|
|
|
{NULL, ICOM_INT_MASK_PRC_C},
|
|
@@ -1087,8 +1087,7 @@ static void icom_close(struct uart_port *port)
|
|
|
|
|
|
/* stop receiver */
|
|
|
cmdReg = readb(&ICOM_PORT->dram->CmdReg);
|
|
|
- writeb(cmdReg & (unsigned char) ~CMD_RCV_ENABLE,
|
|
|
- &ICOM_PORT->dram->CmdReg);
|
|
|
+ writeb(cmdReg & ~CMD_RCV_ENABLE, &ICOM_PORT->dram->CmdReg);
|
|
|
|
|
|
shutdown(ICOM_PORT);
|
|
|
|
|
@@ -1567,7 +1566,7 @@ static int icom_probe(struct pci_dev *dev,
|
|
|
icom_port->uart_port.type = PORT_ICOM;
|
|
|
icom_port->uart_port.iotype = UPIO_MEM;
|
|
|
icom_port->uart_port.membase =
|
|
|
- (char *) icom_adapter->base_addr_pci;
|
|
|
+ (unsigned char __iomem *)icom_adapter->base_addr_pci;
|
|
|
icom_port->uart_port.fifosize = 16;
|
|
|
icom_port->uart_port.ops = &icom_ops;
|
|
|
icom_port->uart_port.line =
|