lkml.org 
[lkml]   [2009]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 1/1] icom: Removing unused variables and converting space to tabs
Currently icom has some spaces instead of tabs and some variables
declared, assigned but not used.

This patch fixes the spaces and also remove those unused variables.

Signed-off-by: Breno Leitao <leitao@linux.vnet.ibm.com>

---
drivers/serial/icom.c | 69 ++++++++++++++++++++-----------------------------
1 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 2b7531d..08fa269 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -302,7 +302,7 @@ static void stop_processor(struct icom_port *icom_port)
if (port < 4) {
temp = readl(stop_proc[port].global_control_reg);
temp =
- (temp & ~start_proc[port].processor_id) | stop_proc[port].processor_id;
+ (temp & ~start_proc[port].processor_id) | stop_proc[port].processor_id;
writel(temp, stop_proc[port].global_control_reg);

/* write flush */
@@ -331,7 +331,7 @@ static void start_processor(struct icom_port *icom_port)
if (port < 4) {
temp = readl(start_proc[port].global_control_reg);
temp =
- (temp & ~stop_proc[port].processor_id) | start_proc[port].processor_id;
+ (temp & ~stop_proc[port].processor_id) | start_proc[port].processor_id;
writel(temp, start_proc[port].global_control_reg);

/* write flush */
@@ -504,8 +504,8 @@ static void load_code(struct icom_port *icom_port)
dev_err(&icom_port->adapter->pci_dev->dev,"Port not opertional\n");
}

- if (new_page != NULL)
- pci_free_consistent(dev, 4096, new_page, temp_pci);
+ if (new_page != NULL)
+ pci_free_consistent(dev, 4096, new_page, temp_pci);
}

static int startup(struct icom_port *icom_port)
@@ -1022,7 +1022,6 @@ static void icom_send_xchar(struct uart_port *port, char ch)
writeb(ch, &ICOM_PORT->dram->xchar);

/* flush write operation */
- xdata = readb(&ICOM_PORT->dram->xchar);
spin_unlock_irqrestore(&port->lock, flags);
break;
}
@@ -1098,7 +1097,6 @@ static void icom_set_termios(struct uart_port *port,
{
int baud;
unsigned cflag, iflag;
- int bits;
char new_config2;
char new_config3 = 0;
char tmp_byte;
@@ -1119,34 +1117,27 @@ static void icom_set_termios(struct uart_port *port,
switch (cflag & CSIZE) {
case CS5: /* 5 bits/char */
new_config2 |= ICOM_ACFG_5BPC;
- bits = 7;
break;
case CS6: /* 6 bits/char */
new_config2 |= ICOM_ACFG_6BPC;
- bits = 8;
break;
case CS7: /* 7 bits/char */
new_config2 |= ICOM_ACFG_7BPC;
- bits = 9;
break;
case CS8: /* 8 bits/char */
new_config2 |= ICOM_ACFG_8BPC;
- bits = 10;
break;
default:
- bits = 10;
break;
}
if (cflag & CSTOPB) {
/* 2 stop bits */
new_config2 |= ICOM_ACFG_2STOP_BIT;
- bits++;
}
if (cflag & PARENB) {
/* parity bit enabled */
new_config2 |= ICOM_ACFG_PARITY_ENAB;
trace(ICOM_PORT, "PARENB", 0);
- bits++;
}
if (cflag & PARODD) {
/* odd parity */
@@ -1322,7 +1313,6 @@ static struct uart_driver icom_uart_driver = {
static int __devinit icom_init_ports(struct icom_adapter *icom_adapter)
{
u32 subsystem_id = icom_adapter->subsystem_id;
- int retval = 0;
int i;
struct icom_port *icom_port;

@@ -1368,7 +1358,7 @@ static int __devinit icom_init_ports(struct icom_adapter *icom_adapter)
}
}

- return retval;
+ return 0;
}

static void icom_port_active(struct icom_port *icom_port, struct icom_adapter *icom_adapter, int port_num)
@@ -1391,7 +1381,6 @@ static int __devinit icom_load_ports(struct icom_adapter *icom_adapter)
{
struct icom_port *icom_port;
int port_num;
- int retval;

for (port_num = 0; port_num < icom_adapter->numb_ports; port_num++) {

@@ -1405,7 +1394,7 @@ static int __devinit icom_load_ports(struct icom_adapter *icom_adapter)
icom_port->adapter = icom_adapter;

/* get port memory */
- if ((retval = get_port_memory(icom_port)) != 0) {
+ if (get_port_memory(icom_port) != 0) {
dev_err(&icom_port->adapter->pci_dev->dev,
"Memory allocation for port FAILED\n");
}
@@ -1498,15 +1487,15 @@ static int __devinit icom_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
int index;
- unsigned int command_reg;
- int retval;
- struct icom_adapter *icom_adapter;
- struct icom_port *icom_port;
+ unsigned int command_reg;
+ int retval;
+ struct icom_adapter *icom_adapter;
+ struct icom_port *icom_port;

- retval = pci_enable_device(dev);
- if (retval) {
+ retval = pci_enable_device(dev);
+ if (retval) {
dev_err(&dev->dev, "Device enable FAILED\n");
- return retval;
+ return retval;
}

if ( (retval = pci_request_regions(dev, "icom"))) {
@@ -1515,23 +1504,23 @@ static int __devinit icom_probe(struct pci_dev *dev,
return retval;
}

- pci_set_master(dev);
+ pci_set_master(dev);

- if ( (retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg))) {
+ if ( (retval = pci_read_config_dword(dev, PCI_COMMAND, &command_reg))) {
dev_err(&dev->dev, "PCI Config read FAILED\n");
- return retval;
- }
+ return retval;
+ }

pci_write_config_dword(dev, PCI_COMMAND,
command_reg | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER
| PCI_COMMAND_PARITY | PCI_COMMAND_SERR);

- if (ent->driver_data == ADAPTER_V1) {
+ if (ent->driver_data == ADAPTER_V1) {
pci_write_config_dword(dev, 0x44, 0x8300830A);
- } else {
+ } else {
pci_write_config_dword(dev, 0x44, 0x42004200);
pci_write_config_dword(dev, 0x48, 0x42004200);
- }
+ }


retval = icom_alloc_adapter(&icom_adapter);
@@ -1541,10 +1530,10 @@ static int __devinit icom_probe(struct pci_dev *dev,
goto probe_exit0;
}

- icom_adapter->base_addr_pci = pci_resource_start(dev, 0);
- icom_adapter->pci_dev = dev;
- icom_adapter->version = ent->driver_data;
- icom_adapter->subsystem_id = ent->subdevice;
+ icom_adapter->base_addr_pci = pci_resource_start(dev, 0);
+ icom_adapter->pci_dev = dev;
+ icom_adapter->version = ent->driver_data;
+ icom_adapter->subsystem_id = ent->subdevice;


retval = icom_init_ports(icom_adapter);
@@ -1553,7 +1542,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
goto probe_exit1;
}

- icom_adapter->base_addr = ioremap(icom_adapter->base_addr_pci,
+ icom_adapter->base_addr = ioremap(icom_adapter->base_addr_pci,
pci_resource_len(dev, 0));

if (!icom_adapter->base_addr)
@@ -1568,7 +1557,7 @@ static int __devinit icom_probe(struct pci_dev *dev,

retval = icom_load_ports(icom_adapter);

- for (index = 0; index < icom_adapter->numb_ports; index++) {
+ for (index = 0; index < icom_adapter->numb_ports; index++) {
icom_port = &icom_adapter->port_info[index];

if (icom_port->status == ICOM_PORT_ACTIVE) {
@@ -1585,7 +1574,7 @@ static int __devinit icom_probe(struct pci_dev *dev,
icom_port->status = ICOM_PORT_OFF;
dev_err(&dev->dev, "Device add failed\n");
} else
- dev_info(&dev->dev, "Device added\n");
+ dev_info(&dev->dev, "Device added\n");
}
}

@@ -1601,9 +1590,7 @@ probe_exit0:
pci_release_regions(dev);
pci_disable_device(dev);

- return retval;
-
-
+ return retval;
}

static void __devexit icom_remove(struct pci_dev *dev)
--
1.6.0.2


\
 
 \ /
  Last update: 2009-03-11 16:21    [W:0.629 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site