Commit 5f348980 authored by Madhusudhan Chikkature's avatar Madhusudhan Chikkature Committed by Tony Lindgren

HDQ driver: Fix indentation and commenting style

This patch fixes the indentation, commenting style of a single line comment.
Signed-off-by: default avatarMadhusudhan Chikkature <madhu.cr@ti.com>
Acked-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Acked-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 3ea07279
......@@ -100,9 +100,7 @@ static struct w1_bus_master omap_w1_master = {
.search = omap_w1_search_bus,
};
/*
* HDQ register I/O routines
*/
/* HDQ register I/O routines */
static inline u8 hdq_reg_in(struct hdq_data *hdq_data, u32 offset)
{
return __raw_readb(hdq_data->hdq_base + offset);
......@@ -161,11 +159,8 @@ static int hdq_wait_for_flag(struct hdq_data *hdq_data, u32 offset,
return ret;
}
/*
* write out a byte and fill *status with HDQ_INT_STATUS
*/
static int
hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
/* write out a byte and fill *status with HDQ_INT_STATUS */
static int hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
{
int ret;
u8 tmp_status;
......@@ -216,9 +211,7 @@ hdq_write_byte(struct hdq_data *hdq_data, u8 val, u8 *status)
return ret;
}
/*
* HDQ Interrupt service routine.
*/
/* HDQ Interrupt service routine */
static irqreturn_t hdq_isr(int irq, void *_hdq)
{
struct hdq_data *hdq_data = _hdq;
......@@ -239,17 +232,13 @@ static irqreturn_t hdq_isr(int irq, void *_hdq)
return IRQ_HANDLED;
}
/*
* HDQ Mode: always return success.
*/
/* HDQ Mode: always return success */
static u8 omap_w1_reset_bus(void *_hdq)
{
return 0;
}
/*
* W1 search callback function.
*/
/* W1 search callback function */
static void omap_w1_search_bus(void *_hdq, u8 search_type,
w1_slave_found_callback slave_found)
{
......@@ -304,11 +293,8 @@ static int _omap_hdq_reset(struct hdq_data *hdq_data)
return ret;
}
/*
* Issue break pulse to the device.
*/
static int
omap_hdq_break(struct hdq_data *hdq_data)
/* Issue break pulse to the device */
static int omap_hdq_break(struct hdq_data *hdq_data)
{
int ret;
u8 tmp_status;
......@@ -368,6 +354,7 @@ omap_hdq_break(struct hdq_data *hdq_data)
"return to zero, %x", tmp_status);
mutex_unlock(&hdq_data->hdq_mutex);
return ret;
}
......@@ -376,6 +363,7 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
int ret;
u8 status;
unsigned long irqflags;
unsigned long timeout = jiffies + OMAP_HDQ_TIMEOUT;
ret = mutex_lock_interruptible(&hdq_data->hdq_mutex);
if (ret < 0)
......@@ -395,15 +383,12 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
* triggers another interrupt before we
* sleep. So we have to wait for RXCOMPLETE bit.
*/
{
unsigned long timeout = jiffies + OMAP_HDQ_TIMEOUT;
while (!(hdq_data->hdq_irqstatus
& OMAP_HDQ_INT_STATUS_RXCOMPLETE)
&& time_before(jiffies, timeout)) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(1);
}
}
hdq_reg_merge(hdq_data, OMAP_HDQ_CTRL_STATUS, 0,
OMAP_HDQ_CTRL_STATUS_DIR);
spin_lock_irqsave(&hdq_data->hdq_spinlock, irqflags);
......@@ -425,11 +410,8 @@ static int hdq_read_byte(struct hdq_data *hdq_data, u8 *val)
}
/*
* Enable clocks and set the controller to HDQ mode.
*/
static int
omap_hdq_get(struct hdq_data *hdq_data)
/* Enable clocks and set the controller to HDQ mode */
static int omap_hdq_get(struct hdq_data *hdq_data)
{
int ret = 0;
......@@ -479,14 +461,12 @@ omap_hdq_get(struct hdq_data *hdq_data)
}
}
mutex_unlock(&hdq_data->hdq_mutex);
return ret;
}
/*
* Disable clocks to the module.
*/
static int
omap_hdq_put(struct hdq_data *hdq_data)
/* Disable clocks to the module */
static int omap_hdq_put(struct hdq_data *hdq_data)
{
int ret = 0;
......@@ -507,12 +487,11 @@ omap_hdq_put(struct hdq_data *hdq_data)
}
}
mutex_unlock(&hdq_data->hdq_mutex);
return ret;
}
/*
* Read a byte of data from the device.
*/
/* Read a byte of data from the device */
static u8 omap_w1_read_byte(void *_hdq)
{
struct hdq_data *hdq_data = _hdq;
......@@ -547,9 +526,7 @@ static u8 omap_w1_read_byte(void *_hdq)
return val;
}
/*
* Write a byte of data to the device.
*/
/* Write a byte of data to the device */
static void omap_w1_write_byte(void *_hdq, u8 byte)
{
struct hdq_data *hdq_data = _hdq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment