@@ -1014,17 +1014,14 @@ static int bcm_iproc_i2c_cfg_speed(struct bcm_iproc_i2c_dev *iproc_i2c)
10141014 bus_speed = I2C_MAX_STANDARD_MODE_FREQ ;
10151015 }
10161016
1017- if (bus_speed < I2C_MAX_STANDARD_MODE_FREQ ) {
1018- dev_err (iproc_i2c -> device , "%d Hz bus speed not supported\n" ,
1019- bus_speed );
1020- dev_err (iproc_i2c -> device ,
1021- "valid speeds are 100khz and 400khz\n" );
1022- return - EINVAL ;
1023- } else if (bus_speed < I2C_MAX_FAST_MODE_FREQ ) {
1017+ if (bus_speed < I2C_MAX_STANDARD_MODE_FREQ )
1018+ return dev_err_probe (iproc_i2c -> device , - EINVAL ,
1019+ "%d Hz not supported (out of 100-400 kHz range)\n" ,
1020+ bus_speed );
1021+ else if (bus_speed < I2C_MAX_FAST_MODE_FREQ )
10241022 bus_speed = I2C_MAX_STANDARD_MODE_FREQ ;
1025- } else {
1023+ else
10261024 bus_speed = I2C_MAX_FAST_MODE_FREQ ;
1027- }
10281025
10291026 iproc_i2c -> bus_speed = bus_speed ;
10301027 val = iproc_i2c_rd_reg (iproc_i2c , TIM_CFG_OFFSET );
@@ -1066,11 +1063,9 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
10661063 ret = of_property_read_u32 (iproc_i2c -> device -> of_node ,
10671064 "brcm,ape-hsls-addr-mask" ,
10681065 & iproc_i2c -> ape_addr_mask );
1069- if (ret < 0 ) {
1070- dev_err (iproc_i2c -> device ,
1071- "'brcm,ape-hsls-addr-mask' missing\n" );
1072- return - EINVAL ;
1073- }
1066+ if (ret < 0 )
1067+ return dev_err_probe (iproc_i2c -> device , ret ,
1068+ "'brcm,ape-hsls-addr-mask' missing\n" );
10741069
10751070 spin_lock_init (& iproc_i2c -> idm_lock );
10761071
@@ -1090,11 +1085,9 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev)
10901085 ret = devm_request_irq (iproc_i2c -> device , irq ,
10911086 bcm_iproc_i2c_isr , 0 , pdev -> name ,
10921087 iproc_i2c );
1093- if (ret < 0 ) {
1094- dev_err (iproc_i2c -> device ,
1095- "unable to request irq %i\n" , irq );
1096- return ret ;
1097- }
1088+ if (ret < 0 )
1089+ return dev_err_probe (iproc_i2c -> device , ret ,
1090+ "unable to request irq %i\n" , irq );
10981091
10991092 iproc_i2c -> irq = irq ;
11001093 } else {
0 commit comments