@@ -306,11 +306,11 @@ struct bin_attribute {
306
306
size_t size ;
307
307
void * private ;
308
308
struct address_space * (* f_mapping )(void );
309
- ssize_t (* read )(struct file * , struct kobject * , struct bin_attribute * ,
309
+ ssize_t (* read )(struct file * , struct kobject * , const struct bin_attribute * ,
310
310
char * , loff_t , size_t );
311
311
ssize_t (* read_new )(struct file * , struct kobject * , const struct bin_attribute * ,
312
312
char * , loff_t , size_t );
313
- ssize_t (* write )(struct file * , struct kobject * , struct bin_attribute * ,
313
+ ssize_t (* write )(struct file * , struct kobject * , const struct bin_attribute * ,
314
314
char * , loff_t , size_t );
315
315
ssize_t (* write_new )(struct file * , struct kobject * ,
316
316
const struct bin_attribute * , char * , loff_t , size_t );
@@ -332,28 +332,11 @@ struct bin_attribute {
332
332
*/
333
333
#define sysfs_bin_attr_init (bin_attr ) sysfs_attr_init(&(bin_attr)->attr)
334
334
335
- typedef ssize_t __sysfs_bin_rw_handler_new (struct file * , struct kobject * ,
336
- const struct bin_attribute * , char * , loff_t , size_t );
337
-
338
335
/* macros to create static binary attributes easier */
339
336
#define __BIN_ATTR (_name , _mode , _read , _write , _size ) { \
340
337
.attr = { .name = __stringify(_name), .mode = _mode }, \
341
- .read = _Generic(_read, \
342
- __sysfs_bin_rw_handler_new * : NULL, \
343
- default : _read \
344
- ), \
345
- .read_new = _Generic(_read, \
346
- __sysfs_bin_rw_handler_new * : _read, \
347
- default : NULL \
348
- ), \
349
- .write = _Generic(_write, \
350
- __sysfs_bin_rw_handler_new * : NULL, \
351
- default : _write \
352
- ), \
353
- .write_new = _Generic(_write, \
354
- __sysfs_bin_rw_handler_new * : _write, \
355
- default : NULL \
356
- ), \
338
+ .read = _read, \
339
+ .write = _write, \
357
340
.size = _size, \
358
341
}
359
342
0 commit comments