1 From: Russell King <rmk+kernel@armlinux.org.uk>
2 Bcc: linux@mail.armlinux.org.uk
3 Cc: linux-i2c@vger.kernel.org
4 Subject: [PATCH 07/17] i2c: pxa: always set fm and hs members for each type
6 Content-Disposition: inline
7 Content-Transfer-Encoding: 8bit
8 Content-Type: text/plain; charset="utf-8"
10 Always set the fm and hs members of struct pxa_reg_layout. These
11 members are already taking space, we don't need code as well.
13 Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
15 drivers/i2c/busses/i2c-pxa.c | 12 ++++++++++--
16 1 file changed, 10 insertions(+), 2 deletions(-)
18 diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
19 index b3286d7ab75d..05dbe6bf4633 100644
20 --- a/drivers/i2c/busses/i2c-pxa.c
21 +++ b/drivers/i2c/busses/i2c-pxa.c
22 @@ -114,6 +114,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
31 @@ -121,6 +123,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
40 @@ -128,6 +132,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
43 /* no isar register */
49 @@ -137,6 +143,8 @@ static struct pxa_reg_layout pxa_reg_layout[] = {
58 @@ -1235,8 +1243,8 @@ static int i2c_pxa_probe(struct platform_device *dev)
59 i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr;
60 i2c->reg_icr = i2c->reg_base + pxa_reg_layout[i2c_type].icr;
61 i2c->reg_isr = i2c->reg_base + pxa_reg_layout[i2c_type].isr;
62 - i2c->fm_mask = pxa_reg_layout[i2c_type].fm ? : ICR_FM;
63 - i2c->hs_mask = pxa_reg_layout[i2c_type].hs ? : ICR_HS;
64 + i2c->fm_mask = pxa_reg_layout[i2c_type].fm;
65 + i2c->hs_mask = pxa_reg_layout[i2c_type].hs;
67 if (i2c_type != REGS_CE4100)
68 i2c->reg_isar = i2c->reg_base + pxa_reg_layout[i2c_type].isar;