Staging: aten2011: fix up the get_reg_sync function
Name it something sane, and fix up the code to be cleaner.
Cc: Russell Lang <gsview@ghostgum.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
diff --git a/drivers/staging/uc2322/aten2011.c b/drivers/staging/uc2322/aten2011.c
index bc212f7..20c731d 100644
--- a/drivers/staging/uc2322/aten2011.c
+++ b/drivers/staging/uc2322/aten2011.c
@@ -230,8 +230,6 @@
static int RS485mode = 0;
/* setting and get register values */
-static int ATEN2011_get_reg_sync(struct usb_serial_port *port, __u16 reg,
- __u16 * val);
static int ATEN2011_set_Uart_Reg(struct usb_serial_port *port, __u16 reg,
__u16 val);
static int ATEN2011_get_Uart_Reg(struct usb_serial_port *port, __u16 reg,
@@ -278,17 +276,15 @@
ATEN_WDR_TIMEOUT);
}
-static int ATEN2011_get_reg_sync(struct usb_serial_port *port, __u16 reg,
- __u16 * val)
+static int get_reg_sync(struct usb_serial_port *port, __u16 reg, __u16 *val)
{
struct usb_device *dev = port->serial->dev;
- int ret = 0;
+ int ret;
ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), ATEN_RDREQ,
ATEN_RD_RTYPE, 0, reg, val, VENDOR_READ_LENGTH,
ATEN_WDR_TIMEOUT);
- DPRINTK("ATEN2011_get_reg_sync offset is %x, return val %x\n", reg,
- *val);
+ dbg("%s: offset is %x, return val %x\n", __func__, reg, *val);
*val = (*val) & 0x00ff;
return ret;
}
@@ -857,9 +853,8 @@
//NEED to check the fallowing Block
- status = 0;
Data = 0x0;
- status = ATEN2011_get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
if (status < 0) {
DPRINTK("Reading Spreg failed\n");
return -1;
@@ -897,10 +892,8 @@
//**************************CHECK***************************//
- status = 0;
Data = 0x0;
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
if (status < 0) {
DPRINTK("Reading Controlreg failed\n");
return -1;
@@ -984,15 +977,12 @@
#endif
//clearing Bulkin and Bulkout Fifo
Data = 0x0;
- status = 0;
- status = ATEN2011_get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
Data = Data | 0x0c;
- status = 0;
status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
Data = Data & ~0x0c;
- status = 0;
status = set_reg_sync(port, ATEN2011_port->SpRegOffset, Data);
//Finally enable all interrupts
Data = 0x0;
@@ -1002,18 +992,13 @@
//clearing rx_disable
Data = 0x0;
- status = 0;
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
Data = Data & ~0x20;
- status = 0;
status = set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
// rx_negate
Data = 0x0;
- status = 0;
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
+ status = get_reg_sync(port, ATEN2011_port->ControlRegOffset, &Data);
Data = Data | 0x10;
status = 0;
status = set_reg_sync(port, ATEN2011_port->ControlRegOffset, Data);
@@ -2131,13 +2116,10 @@
{
clk_sel_val = 0x0;
Data = 0x0;
- status = 0;
status =
ATEN2011_calc_baud_rate_divisor(baudRate, &divisor,
&clk_sel_val);
- status =
- ATEN2011_get_reg_sync(port, ATEN2011_port->SpRegOffset,
- &Data);
+ status = get_reg_sync(port, ATEN2011_port->SpRegOffset, &Data);
if (status < 0) {
DPRINTK("reading spreg failed in set_serial_baud\n");
return -1;
@@ -2486,10 +2468,8 @@
//enable rx_disable bit in control register
- status =
- ATEN2011_get_reg_sync(serial->port[i],
- ATEN2011_port->ControlRegOffset,
- &Data);
+ status = get_reg_sync(serial->port[i],
+ ATEN2011_port->ControlRegOffset, &Data);
if (status < 0) {
DPRINTK("Reading ControlReg failed status-0x%x\n",
status);