Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 173511
b: refs/heads/master
c: fd2cb0c
h: refs/heads/master
i:
  173509: 34ee4e8
  173507: 62d5174
  173503: db816d3
v: v3
  • Loading branch information
Paul Mundt committed Nov 30, 2009
1 parent 195cc35 commit cf9e340
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9cdae914b2d08febca6e6e0440817d60da115ba5
refs/heads/master: fd2cb0ce74e07babaf8c7bf96ef03c25d194e463
25 changes: 9 additions & 16 deletions trunk/drivers/sh/pfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/

#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/list.h>
Expand Down Expand Up @@ -72,11 +71,9 @@ static void gpio_write_bit(struct pinmux_data_reg *dr,

pos = dr->reg_width - (in_pos + 1);

#ifdef DEBUG
pr_info("write_bit addr = %lx, value = %ld, pos = %ld, "
"r_width = %ld\n",
dr->reg, !!value, pos, dr->reg_width);
#endif
pr_debug("write_bit addr = %lx, value = %ld, pos = %ld, "
"r_width = %ld\n",
dr->reg, !!value, pos, dr->reg_width);

if (value)
set_bit(pos, &dr->reg_shadow);
Expand All @@ -95,11 +92,9 @@ static int gpio_read_reg(unsigned long reg, unsigned long reg_width,
mask = (1 << field_width) - 1;
pos = reg_width - ((in_pos + 1) * field_width);

#ifdef DEBUG
pr_info("read_reg: addr = %lx, pos = %ld, "
"r_width = %ld, f_width = %ld\n",
reg, pos, reg_width, field_width);
#endif
pr_debug("read_reg: addr = %lx, pos = %ld, "
"r_width = %ld, f_width = %ld\n",
reg, pos, reg_width, field_width);

data = gpio_read_raw_reg(reg, reg_width);
return (data >> pos) & mask;
Expand All @@ -114,11 +109,9 @@ static void gpio_write_reg(unsigned long reg, unsigned long reg_width,
mask = (1 << field_width) - 1;
pos = reg_width - ((in_pos + 1) * field_width);

#ifdef DEBUG
pr_info("write_reg addr = %lx, value = %ld, pos = %ld, "
"r_width = %ld, f_width = %ld\n",
reg, value, pos, reg_width, field_width);
#endif
pr_debug("write_reg addr = %lx, value = %ld, pos = %ld, "
"r_width = %ld, f_width = %ld\n",
reg, value, pos, reg_width, field_width);

mask = ~(mask << pos);
value = value << pos;
Expand Down

0 comments on commit cf9e340

Please sign in to comment.