@@ -131,7 +131,7 @@ static ssize_t id_show(struct device *dev, struct device_attribute *dev_attr,
131
131
132
132
if (!hv_dev -> channel )
133
133
return - ENODEV ;
134
- return sprintf (buf , "%d\n" , hv_dev -> channel -> offermsg .child_relid );
134
+ return sysfs_emit (buf , "%d\n" , hv_dev -> channel -> offermsg .child_relid );
135
135
}
136
136
static DEVICE_ATTR_RO (id );
137
137
@@ -142,7 +142,7 @@ static ssize_t state_show(struct device *dev, struct device_attribute *dev_attr,
142
142
143
143
if (!hv_dev -> channel )
144
144
return - ENODEV ;
145
- return sprintf (buf , "%d\n" , hv_dev -> channel -> state );
145
+ return sysfs_emit (buf , "%d\n" , hv_dev -> channel -> state );
146
146
}
147
147
static DEVICE_ATTR_RO (state );
148
148
@@ -153,7 +153,7 @@ static ssize_t monitor_id_show(struct device *dev,
153
153
154
154
if (!hv_dev -> channel )
155
155
return - ENODEV ;
156
- return sprintf (buf , "%d\n" , hv_dev -> channel -> offermsg .monitorid );
156
+ return sysfs_emit (buf , "%d\n" , hv_dev -> channel -> offermsg .monitorid );
157
157
}
158
158
static DEVICE_ATTR_RO (monitor_id );
159
159
@@ -164,8 +164,8 @@ static ssize_t class_id_show(struct device *dev,
164
164
165
165
if (!hv_dev -> channel )
166
166
return - ENODEV ;
167
- return sprintf (buf , "{%pUl}\n" ,
168
- & hv_dev -> channel -> offermsg .offer .if_type );
167
+ return sysfs_emit (buf , "{%pUl}\n" ,
168
+ & hv_dev -> channel -> offermsg .offer .if_type );
169
169
}
170
170
static DEVICE_ATTR_RO (class_id );
171
171
@@ -176,8 +176,8 @@ static ssize_t device_id_show(struct device *dev,
176
176
177
177
if (!hv_dev -> channel )
178
178
return - ENODEV ;
179
- return sprintf (buf , "{%pUl}\n" ,
180
- & hv_dev -> channel -> offermsg .offer .if_instance );
179
+ return sysfs_emit (buf , "{%pUl}\n" ,
180
+ & hv_dev -> channel -> offermsg .offer .if_instance );
181
181
}
182
182
static DEVICE_ATTR_RO (device_id );
183
183
@@ -186,7 +186,7 @@ static ssize_t modalias_show(struct device *dev,
186
186
{
187
187
struct hv_device * hv_dev = device_to_hv_device (dev );
188
188
189
- return sprintf (buf , "vmbus:%*phN\n" , UUID_SIZE , & hv_dev -> dev_type );
189
+ return sysfs_emit (buf , "vmbus:%*phN\n" , UUID_SIZE , & hv_dev -> dev_type );
190
190
}
191
191
static DEVICE_ATTR_RO (modalias );
192
192
@@ -199,7 +199,7 @@ static ssize_t numa_node_show(struct device *dev,
199
199
if (!hv_dev -> channel )
200
200
return - ENODEV ;
201
201
202
- return sprintf (buf , "%d\n" , cpu_to_node (hv_dev -> channel -> target_cpu ));
202
+ return sysfs_emit (buf , "%d\n" , cpu_to_node (hv_dev -> channel -> target_cpu ));
203
203
}
204
204
static DEVICE_ATTR_RO (numa_node );
205
205
#endif
@@ -212,9 +212,8 @@ static ssize_t server_monitor_pending_show(struct device *dev,
212
212
213
213
if (!hv_dev -> channel )
214
214
return - ENODEV ;
215
- return sprintf (buf , "%d\n" ,
216
- channel_pending (hv_dev -> channel ,
217
- vmbus_connection .monitor_pages [0 ]));
215
+ return sysfs_emit (buf , "%d\n" , channel_pending (hv_dev -> channel ,
216
+ vmbus_connection .monitor_pages [0 ]));
218
217
}
219
218
static DEVICE_ATTR_RO (server_monitor_pending );
220
219
@@ -226,9 +225,8 @@ static ssize_t client_monitor_pending_show(struct device *dev,
226
225
227
226
if (!hv_dev -> channel )
228
227
return - ENODEV ;
229
- return sprintf (buf , "%d\n" ,
230
- channel_pending (hv_dev -> channel ,
231
- vmbus_connection .monitor_pages [1 ]));
228
+ return sysfs_emit (buf , "%d\n" , channel_pending (hv_dev -> channel ,
229
+ vmbus_connection .monitor_pages [1 ]));
232
230
}
233
231
static DEVICE_ATTR_RO (client_monitor_pending );
234
232
@@ -240,9 +238,8 @@ static ssize_t server_monitor_latency_show(struct device *dev,
240
238
241
239
if (!hv_dev -> channel )
242
240
return - ENODEV ;
243
- return sprintf (buf , "%d\n" ,
244
- channel_latency (hv_dev -> channel ,
245
- vmbus_connection .monitor_pages [0 ]));
241
+ return sysfs_emit (buf , "%d\n" , channel_latency (hv_dev -> channel ,
242
+ vmbus_connection .monitor_pages [0 ]));
246
243
}
247
244
static DEVICE_ATTR_RO (server_monitor_latency );
248
245
@@ -254,9 +251,8 @@ static ssize_t client_monitor_latency_show(struct device *dev,
254
251
255
252
if (!hv_dev -> channel )
256
253
return - ENODEV ;
257
- return sprintf (buf , "%d\n" ,
258
- channel_latency (hv_dev -> channel ,
259
- vmbus_connection .monitor_pages [1 ]));
254
+ return sysfs_emit (buf , "%d\n" , channel_latency (hv_dev -> channel ,
255
+ vmbus_connection .monitor_pages [1 ]));
260
256
}
261
257
static DEVICE_ATTR_RO (client_monitor_latency );
262
258
@@ -268,9 +264,8 @@ static ssize_t server_monitor_conn_id_show(struct device *dev,
268
264
269
265
if (!hv_dev -> channel )
270
266
return - ENODEV ;
271
- return sprintf (buf , "%d\n" ,
272
- channel_conn_id (hv_dev -> channel ,
273
- vmbus_connection .monitor_pages [0 ]));
267
+ return sysfs_emit (buf , "%d\n" , channel_conn_id (hv_dev -> channel ,
268
+ vmbus_connection .monitor_pages [0 ]));
274
269
}
275
270
static DEVICE_ATTR_RO (server_monitor_conn_id );
276
271
@@ -282,9 +277,8 @@ static ssize_t client_monitor_conn_id_show(struct device *dev,
282
277
283
278
if (!hv_dev -> channel )
284
279
return - ENODEV ;
285
- return sprintf (buf , "%d\n" ,
286
- channel_conn_id (hv_dev -> channel ,
287
- vmbus_connection .monitor_pages [1 ]));
280
+ return sysfs_emit (buf , "%d\n" , channel_conn_id (hv_dev -> channel ,
281
+ vmbus_connection .monitor_pages [1 ]));
288
282
}
289
283
static DEVICE_ATTR_RO (client_monitor_conn_id );
290
284
@@ -303,7 +297,7 @@ static ssize_t out_intr_mask_show(struct device *dev,
303
297
if (ret < 0 )
304
298
return ret ;
305
299
306
- return sprintf (buf , "%d\n" , outbound .current_interrupt_mask );
300
+ return sysfs_emit (buf , "%d\n" , outbound .current_interrupt_mask );
307
301
}
308
302
static DEVICE_ATTR_RO (out_intr_mask );
309
303
@@ -321,7 +315,7 @@ static ssize_t out_read_index_show(struct device *dev,
321
315
& outbound );
322
316
if (ret < 0 )
323
317
return ret ;
324
- return sprintf (buf , "%d\n" , outbound .current_read_index );
318
+ return sysfs_emit (buf , "%d\n" , outbound .current_read_index );
325
319
}
326
320
static DEVICE_ATTR_RO (out_read_index );
327
321
@@ -340,7 +334,7 @@ static ssize_t out_write_index_show(struct device *dev,
340
334
& outbound );
341
335
if (ret < 0 )
342
336
return ret ;
343
- return sprintf (buf , "%d\n" , outbound .current_write_index );
337
+ return sysfs_emit (buf , "%d\n" , outbound .current_write_index );
344
338
}
345
339
static DEVICE_ATTR_RO (out_write_index );
346
340
@@ -359,7 +353,7 @@ static ssize_t out_read_bytes_avail_show(struct device *dev,
359
353
& outbound );
360
354
if (ret < 0 )
361
355
return ret ;
362
- return sprintf (buf , "%d\n" , outbound .bytes_avail_toread );
356
+ return sysfs_emit (buf , "%d\n" , outbound .bytes_avail_toread );
363
357
}
364
358
static DEVICE_ATTR_RO (out_read_bytes_avail );
365
359
@@ -378,7 +372,7 @@ static ssize_t out_write_bytes_avail_show(struct device *dev,
378
372
& outbound );
379
373
if (ret < 0 )
380
374
return ret ;
381
- return sprintf (buf , "%d\n" , outbound .bytes_avail_towrite );
375
+ return sysfs_emit (buf , "%d\n" , outbound .bytes_avail_towrite );
382
376
}
383
377
static DEVICE_ATTR_RO (out_write_bytes_avail );
384
378
@@ -396,7 +390,7 @@ static ssize_t in_intr_mask_show(struct device *dev,
396
390
if (ret < 0 )
397
391
return ret ;
398
392
399
- return sprintf (buf , "%d\n" , inbound .current_interrupt_mask );
393
+ return sysfs_emit (buf , "%d\n" , inbound .current_interrupt_mask );
400
394
}
401
395
static DEVICE_ATTR_RO (in_intr_mask );
402
396
@@ -414,7 +408,7 @@ static ssize_t in_read_index_show(struct device *dev,
414
408
if (ret < 0 )
415
409
return ret ;
416
410
417
- return sprintf (buf , "%d\n" , inbound .current_read_index );
411
+ return sysfs_emit (buf , "%d\n" , inbound .current_read_index );
418
412
}
419
413
static DEVICE_ATTR_RO (in_read_index );
420
414
@@ -432,7 +426,7 @@ static ssize_t in_write_index_show(struct device *dev,
432
426
if (ret < 0 )
433
427
return ret ;
434
428
435
- return sprintf (buf , "%d\n" , inbound .current_write_index );
429
+ return sysfs_emit (buf , "%d\n" , inbound .current_write_index );
436
430
}
437
431
static DEVICE_ATTR_RO (in_write_index );
438
432
@@ -451,7 +445,7 @@ static ssize_t in_read_bytes_avail_show(struct device *dev,
451
445
if (ret < 0 )
452
446
return ret ;
453
447
454
- return sprintf (buf , "%d\n" , inbound .bytes_avail_toread );
448
+ return sysfs_emit (buf , "%d\n" , inbound .bytes_avail_toread );
455
449
}
456
450
static DEVICE_ATTR_RO (in_read_bytes_avail );
457
451
@@ -470,7 +464,7 @@ static ssize_t in_write_bytes_avail_show(struct device *dev,
470
464
if (ret < 0 )
471
465
return ret ;
472
466
473
- return sprintf (buf , "%d\n" , inbound .bytes_avail_towrite );
467
+ return sysfs_emit (buf , "%d\n" , inbound .bytes_avail_towrite );
474
468
}
475
469
static DEVICE_ATTR_RO (in_write_bytes_avail );
476
470
@@ -480,33 +474,29 @@ static ssize_t channel_vp_mapping_show(struct device *dev,
480
474
{
481
475
struct hv_device * hv_dev = device_to_hv_device (dev );
482
476
struct vmbus_channel * channel = hv_dev -> channel , * cur_sc ;
483
- int buf_size = PAGE_SIZE , n_written , tot_written ;
477
+ int n_written ;
484
478
struct list_head * cur ;
485
479
486
480
if (!channel )
487
481
return - ENODEV ;
488
482
489
483
mutex_lock (& vmbus_connection .channel_mutex );
490
484
491
- tot_written = snprintf (buf , buf_size , "%u:%u\n" ,
492
- channel -> offermsg .child_relid , channel -> target_cpu );
485
+ n_written = sysfs_emit (buf , "%u:%u\n" ,
486
+ channel -> offermsg .child_relid ,
487
+ channel -> target_cpu );
493
488
494
489
list_for_each (cur , & channel -> sc_list ) {
495
- if (tot_written >= buf_size - 1 )
496
- break ;
497
490
498
491
cur_sc = list_entry (cur , struct vmbus_channel , sc_list );
499
- n_written = scnprintf (buf + tot_written ,
500
- buf_size - tot_written ,
501
- "%u:%u\n" ,
502
- cur_sc -> offermsg .child_relid ,
503
- cur_sc -> target_cpu );
504
- tot_written += n_written ;
492
+ n_written += sysfs_emit_at (buf , n_written , "%u:%u\n" ,
493
+ cur_sc -> offermsg .child_relid ,
494
+ cur_sc -> target_cpu );
505
495
}
506
496
507
497
mutex_unlock (& vmbus_connection .channel_mutex );
508
498
509
- return tot_written ;
499
+ return n_written ;
510
500
}
511
501
static DEVICE_ATTR_RO (channel_vp_mapping );
512
502
@@ -516,7 +506,7 @@ static ssize_t vendor_show(struct device *dev,
516
506
{
517
507
struct hv_device * hv_dev = device_to_hv_device (dev );
518
508
519
- return sprintf (buf , "0x%x\n" , hv_dev -> vendor_id );
509
+ return sysfs_emit (buf , "0x%x\n" , hv_dev -> vendor_id );
520
510
}
521
511
static DEVICE_ATTR_RO (vendor );
522
512
@@ -526,7 +516,7 @@ static ssize_t device_show(struct device *dev,
526
516
{
527
517
struct hv_device * hv_dev = device_to_hv_device (dev );
528
518
529
- return sprintf (buf , "0x%x\n" , hv_dev -> device_id );
519
+ return sysfs_emit (buf , "0x%x\n" , hv_dev -> device_id );
530
520
}
531
521
static DEVICE_ATTR_RO (device );
532
522
@@ -551,7 +541,7 @@ static ssize_t driver_override_show(struct device *dev,
551
541
ssize_t len ;
552
542
553
543
device_lock (dev );
554
- len = snprintf (buf , PAGE_SIZE , "%s\n" , hv_dev -> driver_override );
544
+ len = sysfs_emit (buf , "%s\n" , hv_dev -> driver_override );
555
545
device_unlock (dev );
556
546
557
547
return len ;
0 commit comments