Skip to content

Commit

Permalink
dma-debug: simplify logic in driver_filter()
Browse files Browse the repository at this point in the history
This patch makes the driver_filter function more readable by
reorganizing the code. The removal of a code code block to an upper
indentation level makes hard-to-read line-wraps unnecessary.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
  • Loading branch information
Joerg Roedel committed Jun 8, 2009
1 parent be81c6e commit 0bf8412
Showing 1 changed file with 21 additions and 21 deletions.
42 changes: 21 additions & 21 deletions lib/dma-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ static inline void dump_entry_trace(struct dma_debug_entry *entry)

static bool driver_filter(struct device *dev)
{
struct device_driver *drv;
unsigned long flags;
bool ret;

/* driver filter off */
if (likely(!current_driver_name[0]))
return true;
Expand All @@ -155,32 +159,28 @@ static bool driver_filter(struct device *dev)
if (current_driver && dev->driver == current_driver)
return true;

/* driver filter on but not yet initialized */
if (!current_driver && current_driver_name[0]) {
struct device_driver *drv = get_driver(dev->driver);
unsigned long flags;
bool ret = false;

if (!drv)
return false;

/* lock to protect against change of current_driver_name */
read_lock_irqsave(&driver_name_lock, flags);
if (current_driver || !current_driver_name[0])
return false;

if (drv->name &&
strncmp(current_driver_name, drv->name,
NAME_MAX_LEN-1) == 0) {
current_driver = drv;
ret = true;
}
/* driver filter on but not yet initialized */
drv = get_driver(dev->driver);
if (!drv)
return false;

read_unlock_irqrestore(&driver_name_lock, flags);
put_driver(drv);
/* lock to protect against change of current_driver_name */
read_lock_irqsave(&driver_name_lock, flags);

return ret;
ret = false;
if (drv->name &&
strncmp(current_driver_name, drv->name, NAME_MAX_LEN - 1) == 0) {
current_driver = drv;
ret = true;
}

return false;
read_unlock_irqrestore(&driver_name_lock, flags);
put_driver(drv);

return ret;
}

#define err_printk(dev, entry, format, arg...) do { \
Expand Down

0 comments on commit 0bf8412

Please sign in to comment.