@@ -898,7 +898,7 @@ static DEVICE_ATTR(queue_type, S_IRUGO | S_IWUSR, show_queue_type_field,
898
898
#define sdev_vpd_pg_attr (_page ) \
899
899
static ssize_t \
900
900
show_vpd_##_page(struct file *filp, struct kobject *kobj, \
901
- struct bin_attribute *bin_attr, \
901
+ const struct bin_attribute *bin_attr, \
902
902
char *buf, loff_t off, size_t count) \
903
903
{ \
904
904
struct device *dev = kobj_to_dev(kobj); \
@@ -914,10 +914,10 @@ show_vpd_##_page(struct file *filp, struct kobject *kobj, \
914
914
rcu_read_unlock(); \
915
915
return ret; \
916
916
} \
917
- static struct bin_attribute dev_attr_vpd_##_page = { \
917
+ static const struct bin_attribute dev_attr_vpd_##_page = { \
918
918
.attr = {.name = __stringify(vpd_##_page), .mode = S_IRUGO }, \
919
919
.size = 0, \
920
- .read = show_vpd_##_page, \
920
+ .read_new = show_vpd_##_page, \
921
921
};
922
922
923
923
sdev_vpd_pg_attr (pg83 );
@@ -930,7 +930,7 @@ sdev_vpd_pg_attr(pgb7);
930
930
sdev_vpd_pg_attr (pg0 );
931
931
932
932
static ssize_t show_inquiry (struct file * filep , struct kobject * kobj ,
933
- struct bin_attribute * bin_attr ,
933
+ const struct bin_attribute * bin_attr ,
934
934
char * buf , loff_t off , size_t count )
935
935
{
936
936
struct device * dev = kobj_to_dev (kobj );
@@ -943,13 +943,13 @@ static ssize_t show_inquiry(struct file *filep, struct kobject *kobj,
943
943
sdev -> inquiry_len );
944
944
}
945
945
946
- static struct bin_attribute dev_attr_inquiry = {
946
+ static const struct bin_attribute dev_attr_inquiry = {
947
947
.attr = {
948
948
.name = "inquiry" ,
949
949
.mode = S_IRUGO ,
950
950
},
951
951
.size = 0 ,
952
- .read = show_inquiry ,
952
+ .read_new = show_inquiry ,
953
953
};
954
954
955
955
static ssize_t
@@ -1348,7 +1348,7 @@ static struct attribute *scsi_sdev_attrs[] = {
1348
1348
NULL
1349
1349
};
1350
1350
1351
- static struct bin_attribute * scsi_sdev_bin_attrs [] = {
1351
+ static const struct bin_attribute * const scsi_sdev_bin_attrs [] = {
1352
1352
& dev_attr_vpd_pg0 ,
1353
1353
& dev_attr_vpd_pg83 ,
1354
1354
& dev_attr_vpd_pg80 ,
@@ -1362,7 +1362,7 @@ static struct bin_attribute *scsi_sdev_bin_attrs[] = {
1362
1362
};
1363
1363
static struct attribute_group scsi_sdev_attr_group = {
1364
1364
.attrs = scsi_sdev_attrs ,
1365
- .bin_attrs = scsi_sdev_bin_attrs ,
1365
+ .bin_attrs_new = scsi_sdev_bin_attrs ,
1366
1366
.is_visible = scsi_sdev_attr_is_visible ,
1367
1367
.is_bin_visible = scsi_sdev_bin_attr_is_visible ,
1368
1368
};
0 commit comments