@@ -44,16 +44,13 @@ static int wmt_i2c_reset_hardware(struct viai2c *i2c)
44
44
int err ;
45
45
46
46
err = clk_prepare_enable (i2c -> clk );
47
- if (err ) {
48
- dev_err (i2c -> dev , "failed to enable clock\n" );
49
- return err ;
50
- }
47
+ if (err )
48
+ return dev_err_probe (i2c -> dev , err , "failed to enable clock\n" );
51
49
52
50
err = clk_set_rate (i2c -> clk , 20000000 );
53
51
if (err ) {
54
- dev_err (i2c -> dev , "failed to set clock = 20Mhz\n" );
55
52
clk_disable_unprepare (i2c -> clk );
56
- return err ;
53
+ return dev_err_probe ( i2c -> dev , err , "failed to set clock = 20Mhz\n" ) ;
57
54
}
58
55
59
56
writew (0 , i2c -> base + VIAI2C_REG_CR );
@@ -121,10 +118,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)
121
118
"failed to request irq %i\n" , i2c -> irq );
122
119
123
120
i2c -> clk = of_clk_get (np , 0 );
124
- if (IS_ERR (i2c -> clk )) {
125
- dev_err (& pdev -> dev , "unable to request clock\n" );
126
- return PTR_ERR (i2c -> clk );
127
- }
121
+ if (IS_ERR (i2c -> clk ))
122
+ return dev_err_probe (& pdev -> dev , PTR_ERR (i2c -> clk ),
123
+ "unable to request clock\n" );
128
124
129
125
err = of_property_read_u32 (np , "clock-frequency" , & clk_rate );
130
126
if (!err && clk_rate == I2C_MAX_FAST_MODE_FREQ )
@@ -139,10 +135,8 @@ static int wmt_i2c_probe(struct platform_device *pdev)
139
135
adap -> dev .of_node = pdev -> dev .of_node ;
140
136
141
137
err = wmt_i2c_reset_hardware (i2c );
142
- if (err ) {
143
- dev_err (& pdev -> dev , "error initializing hardware\n" );
138
+ if (err )
144
139
return err ;
145
- }
146
140
147
141
err = i2c_add_adapter (adap );
148
142
if (err )
0 commit comments