@@ -23,15 +23,15 @@ static ssize_t qeth_dev_state_show(struct device *dev,
2323
2424 switch (card -> state ) {
2525 case CARD_STATE_DOWN :
26- return sprintf (buf , "DOWN\n" );
26+ return sysfs_emit (buf , "DOWN\n" );
2727 case CARD_STATE_SOFTSETUP :
2828 if (card -> dev -> flags & IFF_UP )
29- return sprintf (buf , "UP (LAN %s)\n" ,
30- netif_carrier_ok (card -> dev ) ? "ONLINE" :
31- "OFFLINE" );
32- return sprintf (buf , "SOFTSETUP\n" );
29+ return sysfs_emit (buf , "UP (LAN %s)\n" ,
30+ netif_carrier_ok (card -> dev ) ?
31+ "ONLINE" : "OFFLINE" );
32+ return sysfs_emit (buf , "SOFTSETUP\n" );
3333 default :
34- return sprintf (buf , "UNKNOWN\n" );
34+ return sysfs_emit (buf , "UNKNOWN\n" );
3535 }
3636}
3737
@@ -42,7 +42,7 @@ static ssize_t qeth_dev_chpid_show(struct device *dev,
4242{
4343 struct qeth_card * card = dev_get_drvdata (dev );
4444
45- return sprintf (buf , "%02X\n" , card -> info .chpid );
45+ return sysfs_emit (buf , "%02X\n" , card -> info .chpid );
4646}
4747
4848static DEVICE_ATTR (chpid , 0444 , qeth_dev_chpid_show , NULL) ;
@@ -52,7 +52,7 @@ static ssize_t qeth_dev_if_name_show(struct device *dev,
5252{
5353 struct qeth_card * card = dev_get_drvdata (dev );
5454
55- return sprintf (buf , "%s\n" , netdev_name (card -> dev ));
55+ return sysfs_emit (buf , "%s\n" , netdev_name (card -> dev ));
5656}
5757
5858static DEVICE_ATTR (if_name , 0444 , qeth_dev_if_name_show , NULL) ;
@@ -62,7 +62,7 @@ static ssize_t qeth_dev_card_type_show(struct device *dev,
6262{
6363 struct qeth_card * card = dev_get_drvdata (dev );
6464
65- return sprintf (buf , "%s\n" , qeth_get_cardname_short (card ));
65+ return sysfs_emit (buf , "%s\n" , qeth_get_cardname_short (card ));
6666}
6767
6868static DEVICE_ATTR (card_type , 0444 , qeth_dev_card_type_show , NULL) ;
@@ -86,7 +86,7 @@ static ssize_t qeth_dev_inbuf_size_show(struct device *dev,
8686{
8787 struct qeth_card * card = dev_get_drvdata (dev );
8888
89- return sprintf (buf , "%s\n" , qeth_get_bufsize_str (card ));
89+ return sysfs_emit (buf , "%s\n" , qeth_get_bufsize_str (card ));
9090}
9191
9292static DEVICE_ATTR (inbuf_size , 0444 , qeth_dev_inbuf_size_show , NULL) ;
@@ -96,7 +96,7 @@ static ssize_t qeth_dev_portno_show(struct device *dev,
9696{
9797 struct qeth_card * card = dev_get_drvdata (dev );
9898
99- return sprintf (buf , "%i\n" , card -> dev -> dev_port );
99+ return sysfs_emit (buf , "%i\n" , card -> dev -> dev_port );
100100}
101101
102102static ssize_t qeth_dev_portno_store (struct device * dev ,
@@ -134,7 +134,7 @@ static DEVICE_ATTR(portno, 0644, qeth_dev_portno_show, qeth_dev_portno_store);
134134static ssize_t qeth_dev_portname_show (struct device * dev ,
135135 struct device_attribute * attr , char * buf )
136136{
137- return sprintf (buf , "no portname required\n" );
137+ return sysfs_emit (buf , "no portname required\n" );
138138}
139139
140140static ssize_t qeth_dev_portname_store (struct device * dev ,
@@ -157,18 +157,18 @@ static ssize_t qeth_dev_prioqing_show(struct device *dev,
157157
158158 switch (card -> qdio .do_prio_queueing ) {
159159 case QETH_PRIO_Q_ING_PREC :
160- return sprintf (buf , "%s\n" , "by precedence" );
160+ return sysfs_emit (buf , "%s\n" , "by precedence" );
161161 case QETH_PRIO_Q_ING_TOS :
162- return sprintf (buf , "%s\n" , "by type of service" );
162+ return sysfs_emit (buf , "%s\n" , "by type of service" );
163163 case QETH_PRIO_Q_ING_SKB :
164- return sprintf (buf , "%s\n" , "by skb-priority" );
164+ return sysfs_emit (buf , "%s\n" , "by skb-priority" );
165165 case QETH_PRIO_Q_ING_VLAN :
166- return sprintf (buf , "%s\n" , "by VLAN headers" );
166+ return sysfs_emit (buf , "%s\n" , "by VLAN headers" );
167167 case QETH_PRIO_Q_ING_FIXED :
168- return sprintf (buf , "always queue %i\n" ,
168+ return sysfs_emit (buf , "always queue %i\n" ,
169169 card -> qdio .default_out_queue );
170170 default :
171- return sprintf (buf , "disabled\n" );
171+ return sysfs_emit (buf , "disabled\n" );
172172 }
173173}
174174
@@ -242,7 +242,7 @@ static ssize_t qeth_dev_bufcnt_show(struct device *dev,
242242{
243243 struct qeth_card * card = dev_get_drvdata (dev );
244244
245- return sprintf (buf , "%i\n" , card -> qdio .in_buf_pool .buf_count );
245+ return sysfs_emit (buf , "%i\n" , card -> qdio .in_buf_pool .buf_count );
246246}
247247
248248static ssize_t qeth_dev_bufcnt_store (struct device * dev ,
@@ -298,7 +298,7 @@ static DEVICE_ATTR(recover, 0200, NULL, qeth_dev_recover_store);
298298static ssize_t qeth_dev_performance_stats_show (struct device * dev ,
299299 struct device_attribute * attr , char * buf )
300300{
301- return sprintf (buf , "1\n" );
301+ return sysfs_emit (buf , "1\n" );
302302}
303303
304304static ssize_t qeth_dev_performance_stats_store (struct device * dev ,
@@ -335,7 +335,7 @@ static ssize_t qeth_dev_layer2_show(struct device *dev,
335335{
336336 struct qeth_card * card = dev_get_drvdata (dev );
337337
338- return sprintf (buf , "%i\n" , card -> options .layer );
338+ return sysfs_emit (buf , "%i\n" , card -> options .layer );
339339}
340340
341341static ssize_t qeth_dev_layer2_store (struct device * dev ,
@@ -470,23 +470,25 @@ static ssize_t qeth_dev_switch_attrs_show(struct device *dev,
470470 int rc = 0 ;
471471
472472 if (!qeth_card_hw_is_reachable (card ))
473- return sprintf (buf , "n/a\n" );
473+ return sysfs_emit (buf , "n/a\n" );
474474
475475 rc = qeth_query_switch_attributes (card , & sw_info );
476476 if (rc )
477477 return rc ;
478478
479479 if (!sw_info .capabilities )
480- rc = sprintf (buf , "unknown" );
480+ rc = sysfs_emit (buf , "unknown" );
481481
482482 if (sw_info .capabilities & QETH_SWITCH_FORW_802_1 )
483- rc = sprintf (buf , (sw_info .settings & QETH_SWITCH_FORW_802_1 ?
484- "[802.1]" : "802.1" ));
483+ rc = sysfs_emit (buf ,
484+ (sw_info .settings & QETH_SWITCH_FORW_802_1 ?
485+ "[802.1]" : "802.1" ));
485486 if (sw_info .capabilities & QETH_SWITCH_FORW_REFL_RELAY )
486- rc += sprintf (buf + rc ,
487- (sw_info .settings & QETH_SWITCH_FORW_REFL_RELAY ?
488- " [rr]" : " rr" ));
489- rc += sprintf (buf + rc , "\n" );
487+ rc += sysfs_emit_at (buf , rc ,
488+ (sw_info .settings &
489+ QETH_SWITCH_FORW_REFL_RELAY ?
490+ " [rr]" : " rr" ));
491+ rc += sysfs_emit_at (buf , rc , "\n" );
490492
491493 return rc ;
492494}
@@ -573,7 +575,7 @@ static ssize_t qeth_dev_blkt_total_show(struct device *dev,
573575{
574576 struct qeth_card * card = dev_get_drvdata (dev );
575577
576- return sprintf (buf , "%i\n" , card -> info .blkt .time_total );
578+ return sysfs_emit (buf , "%i\n" , card -> info .blkt .time_total );
577579}
578580
579581static ssize_t qeth_dev_blkt_total_store (struct device * dev ,
@@ -593,7 +595,7 @@ static ssize_t qeth_dev_blkt_inter_show(struct device *dev,
593595{
594596 struct qeth_card * card = dev_get_drvdata (dev );
595597
596- return sprintf (buf , "%i\n" , card -> info .blkt .inter_packet );
598+ return sysfs_emit (buf , "%i\n" , card -> info .blkt .inter_packet );
597599}
598600
599601static ssize_t qeth_dev_blkt_inter_store (struct device * dev ,
@@ -613,7 +615,7 @@ static ssize_t qeth_dev_blkt_inter_jumbo_show(struct device *dev,
613615{
614616 struct qeth_card * card = dev_get_drvdata (dev );
615617
616- return sprintf (buf , "%i\n" , card -> info .blkt .inter_packet_jumbo );
618+ return sysfs_emit (buf , "%i\n" , card -> info .blkt .inter_packet_jumbo );
617619}
618620
619621static ssize_t qeth_dev_blkt_inter_jumbo_store (struct device * dev ,
0 commit comments