@@ -137,10 +137,8 @@ static int mxl862xx_phy_read_mmd(struct mxl862xx_priv *priv, int port, int devad
137137 int ret ;
138138
139139 ret = MXL862XX_API_READ (priv , INT_GPHY_READ , param );
140- if (ret ) {
141- pr_debug ("mxl862xx: failed to read mmd on port %d\n" , port );
140+ if (ret )
142141 return ret ;
143- }
144142
145143 return param .data ;
146144}
@@ -157,9 +155,6 @@ static int mxl862xx_phy_write_mmd(struct mxl862xx_priv *priv, int port,
157155 int ret ;
158156
159157 ret = MXL862XX_API_WRITE (priv , INT_GPHY_WRITE , param );
160- if (ret )
161- pr_debug ("mxl862xx: failed to write mmd on port %d\n" , port );
162-
163158 return ret ;
164159}
165160
@@ -360,34 +355,24 @@ static enum dsa_tag_protocol mxl862_parse_tag_proto(struct dsa_switch *ds, uint8
360355 /* Default value if no dt entry found */
361356 enum dsa_tag_protocol tag_proto = DSA_TAG_PROTO_MXL862 ;
362357 struct dsa_port * dp = dsa_to_port (ds , port );
363- const char * selected_proto = "mxl862" ;
364358 const char * user_protocol ;
365359 int ret ;
366360
367361 if (!dp || !dp -> dn )
368362 return tag_proto ;
369363
370364 ret = of_property_read_string (dp -> dn , "dsa-tag-protocol" , & user_protocol );
371- if (ret ) {
372- dev_info (ds -> dev ,
373- "port %u has no dsa-tag-protocol in DT, using %s\n" ,
374- port , selected_proto );
365+ if (ret )
375366 return tag_proto ;
376- }
377367
378368 if (!strcmp (user_protocol , "mxl862" ))
379369 tag_proto = DSA_TAG_PROTO_MXL862 ;
380- else if (!strcmp (user_protocol , "mxl862_8021q" )) {
370+ else if (!strcmp (user_protocol , "mxl862_8021q" ))
381371 tag_proto = DSA_TAG_PROTO_MXL862_8021Q ;
382- selected_proto = "mxl862_8021q" ;
383- } else {
372+ else
384373 dev_warn (ds -> dev ,
385374 "port %u has unsupported dsa-tag-protocol \"%s\", falling back to mxl862\n" ,
386375 port , user_protocol );
387- }
388-
389- dev_info (ds -> dev , "port %u dsa-tag-protocol=\"%s\" -> using %s\n" ,
390- port , user_protocol , selected_proto );
391376
392377 return tag_proto ;
393378}
@@ -3163,7 +3148,6 @@ static int mxl862xx_setup(struct dsa_switch *ds)
31633148 priv -> bridge_portmap [i ] = BIT (DSA_MXL_PORT (cpu_port ));
31643149
31653150 mxl862xx_set_vlan_filter_limits (ds );
3166- dev_info (ds -> dev , "setup: vlan limits configured, start per-port init\n" );
31673151 for (i = 0 ; i < MAX_VLANS ; i ++ )
31683152 priv -> port_info [cpu_port ].vlan .egress_vlan_block_info .vlans [i ].untagged = true;
31693153
@@ -3175,28 +3159,22 @@ static int mxl862xx_setup(struct dsa_switch *ds)
31753159 priv -> port_info [i ].isolated = false;
31763160
31773161 if (dsa_is_cpu_port (ds , i )) {
3178- dev_info (ds -> dev , "setup: skip cpu port %u\n" , i );
31793162 continue ;
31803163 }
31813164
3182- dev_info (ds -> dev , "setup: init user port %u (disable)\n" , i );
31833165 ret = mxl862xx_port_state (ds , i , false);
31843166 if (ret )
31853167 return ret ;
31863168
3187- dev_info (ds -> dev , "setup: init user port %u (isolate)\n" , i );
31883169 ret = mxl862xx_isolate_port (ds , i );
31893170 if (ret )
31903171 return ret ;
31913172
3192- dev_info (ds -> dev , "setup: init user port %u (fast_age)\n" , i );
31933173 mxl862xx_port_fast_age (ds , i );
3194- dev_info (ds -> dev , "setup: init user port %u done\n" , i );
31953174 priv -> bridge_portmap [0 ] |= BIT (DSA_MXL_PORT (i ));
31963175 }
31973176
31983177 /* Update CPU bridge port */
3199- dev_info (ds -> dev , "setup: update cpu bridge port map\n" );
32003178 br_port_cfg .bridge_port_id = DSA_MXL_PORT (cpu_port ),
32013179 br_port_cfg .bridge_port_map [0 ] = priv -> bridge_portmap [0 ];
32023180 ret = MXL862XX_API_WRITE (priv , MXL862XX_BRIDGEPORT_CONFIGSET , br_port_cfg );
@@ -3205,9 +3183,7 @@ static int mxl862xx_setup(struct dsa_switch *ds)
32053183 return ret ;
32063184 }
32073185
3208- dev_info (ds -> dev , "setup: cpu fast_age\n" );
32093186 mxl862xx_port_fast_age (ds , cpu_port );
3210- dev_info (ds -> dev , "setup: complete\n" );
32113187
32123188 return 0 ;
32133189}
@@ -3776,8 +3752,6 @@ static void sfp_monitor_work_func(struct work_struct *work)
37763752 mux -> data [new_channel ]-> phylink = NULL ;
37773753 goto reschedule ;
37783754 }
3779- dev_info (ds -> dev , "dsa mux: created phylink for channel %u\n" ,
3780- new_channel );
37813755 }
37823756
37833757 running = dev && netif_running (dev );
@@ -3797,8 +3771,6 @@ static void sfp_monitor_work_func(struct work_struct *work)
37973771 phylink_start (dp -> pl );
37983772 }
37993773
3800- dev_info (ds -> dev , "dsa mux: switch to channel%d\n" , new_channel );
3801-
38023774 gpiod_set_value_cansleep (mux -> chan_sel_gpio , new_channel );
38033775
38043776 rtnl_unlock ();
@@ -3846,7 +3818,6 @@ static int ds_add_mux_channel(struct combo_port_mux *mux, struct device_node *np
38463818 */
38473819 if (id == mux -> sfp_present_channel ) {
38483820 data -> phylink = NULL ;
3849- dev_info (ds -> dev , "dsa mux: channel %d phylink deferred\n" , id );
38503821 } else {
38513822 data -> phylink = phylink_create (& mux -> dp -> pl_config ,
38523823 of_fwnode_handle (np ),
@@ -3928,9 +3899,6 @@ static int ds_add_mux(struct mxl862xx_priv *priv, struct device_node *np)
39283899 }
39293900 mux -> channel = !mux -> sfp_present_channel ;
39303901 gpiod_set_value_cansleep (mux -> chan_sel_gpio , mux -> channel );
3931- dev_info (priv -> dev ,
3932- "dsa mux: id %u init channel %u (forced non-SFP, sfp-present-channel=%u, mod-def0=%d)\n" ,
3933- id , mux -> channel , mux -> sfp_present_channel , sfp_present );
39343902
39353903 for_each_child_of_node (np , child ) {
39363904 err = ds_add_mux_channel (mux , child );
@@ -3943,8 +3911,6 @@ static int ds_add_mux(struct mxl862xx_priv *priv, struct device_node *np)
39433911
39443912 mux -> dp -> dn = mux -> data [mux -> channel ]-> of_node ;
39453913 mux -> dp -> pl = mux -> data [mux -> channel ]-> phylink ;
3946- dev_info (priv -> dev , "dsa mux: id %u initial phylink attached to channel %u\n" ,
3947- id , mux -> channel );
39483914
39493915 INIT_DELAYED_WORK (& mux -> sfp_monitor_work , sfp_monitor_work_func );
39503916 mod_delayed_work (system_wq , & mux -> sfp_monitor_work , msecs_to_jiffies (3000 ));
@@ -4037,7 +4003,6 @@ static int mxl862xx_probe(struct mdio_device *mdiodev)
40374003 dev_err (dev , "failed to register DSA switch\n" );
40384004 return ret ;
40394005 }
4040- dev_info (dev , "probe: dsa_register_switch complete\n" );
40414006
40424007 if (!dsa_is_cpu_port (ds , priv -> cpu_port )) {
40434008 dev_err (dev ,
@@ -4056,13 +4021,11 @@ static int mxl862xx_probe(struct mdio_device *mdiodev)
40564021 dev_info (dev , "Firmware version %d.%d.%d.%d" ,
40574022 fw_version .iv_major , fw_version .iv_minor ,
40584023 fw_version .iv_revision , fw_version .iv_build_num );
4059- dev_info (dev , "probe: firmware version read complete\n" );
40604024
40614025 mux_np = of_get_child_by_name (priv -> ds -> dev -> of_node , "ds-mux-bus" );
40624026 if (mux_np ) {
40634027 struct device_node * child ;
40644028
4065- dev_info (dev , "probe: start ds-mux enumeration\n" );
40664029 for_each_available_child_of_node (mux_np , child ) {
40674030 if (!of_device_is_compatible (child ,
40684031 "mxl862xx,ds-mux" ))
@@ -4074,12 +4037,9 @@ static int mxl862xx_probe(struct mdio_device *mdiodev)
40744037 ret = ds_add_mux (priv , child );
40754038 if (ret )
40764039 dev_err (dev , "failed to add mux\n" );
4077- else
4078- dev_info (dev , "probe: ds-mux added\n" );
40794040 };
40804041 of_node_put (mux_np );
40814042 }
4082- dev_info (dev , "probe: complete\n" );
40834043
40844044 return 0 ;
40854045}
0 commit comments