Linux Virtualization - Jul 2017 - [PATCH v1] virtio_blk: Use sysfs_match_string() helper

Use sysfs_match_string() helper instead of open coded variant.

Cc: "Michael S. Tsirkin" <mst at redhat.com>
Cc: Jason Wang <jasowang at redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
---
 drivers/block/virtio_blk.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 553cc4c542b4..0e707b8cce9d 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -541,12 +541,9 @@ virtblk_cache_type_store(struct device *dev, struct
device_attribute *attr,
 	int i;
 
 	BUG_ON(!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_CONFIG_WCE));
-	for (i = ARRAY_SIZE(virtblk_cache_types); --i >= 0; )
-		if (sysfs_streq(buf, virtblk_cache_types[i]))
-			break;
-
+	i = sysfs_match_string(virtblk_cache_types, buf);
 	if (i < 0)
-		return -EINVAL;
+		return i;
 
 	virtio_cwrite8(vdev, offsetof(struct virtio_blk_config, wce), i);
 	virtblk_update_cache_mode(vdev);
-- 
2.11.0

On Fri, 2017-06-09 at 15:07 +0300, Andy Shevchenko
wrote:
> Use sysfs_match_string() helper instead of open coded variant.
Did I miss maintainer?
> 
> Cc: "Michael S. Tsirkin" <mst at redhat.com>
> Cc: Jason Wang <jasowang at redhat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> ---
> ?drivers/block/virtio_blk.c | 7 ++-----
> ?1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 553cc4c542b4..0e707b8cce9d 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -541,12 +541,9 @@ virtblk_cache_type_store(struct device *dev,
> struct device_attribute *attr,
> ?	int i;
> ?
> ?	BUG_ON(!virtio_has_feature(vblk->vdev,
> VIRTIO_BLK_F_CONFIG_WCE));
> -	for (i = ARRAY_SIZE(virtblk_cache_types); --i >= 0; )
> -		if (sysfs_streq(buf, virtblk_cache_types[i]))
> -			break;
> -
> +	i = sysfs_match_string(virtblk_cache_types, buf);
> ?	if (i < 0)
> -		return -EINVAL;
> +		return i;
> ?
> ?	virtio_cwrite8(vdev, offsetof(struct virtio_blk_config, wce),
> i);
> ?	virtblk_update_cache_mode(vdev);
-- 
Andy Shevchenko <andriy.shevchenko at linux.intel.com>
Intel Finland Oy

On Mon, Jul 03, 2017 at 03:05:30PM +0300, Andy Shevchenko
wrote:
> On Fri, 2017-06-09 at 15:07 +0300, Andy Shevchenko wrote:
> > Use sysfs_match_string() helper instead of open coded variant.
> 
> Did I miss maintainer?
> 
> > 
> > Cc: "Michael S. Tsirkin" <mst at redhat.com>
> > Cc: Jason Wang <jasowang at redhat.com>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko at
linux.intel.com>

You didn't, I'll merge this in the next PULL.

Thanks!
> > ---
> > ?drivers/block/virtio_blk.c | 7 ++-----
> > ?1 file changed, 2 insertions(+), 5 deletions(-)
> > 
> > diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> > index 553cc4c542b4..0e707b8cce9d 100644
> > --- a/drivers/block/virtio_blk.c
> > +++ b/drivers/block/virtio_blk.c
> > @@ -541,12 +541,9 @@ virtblk_cache_type_store(struct device *dev,
> > struct device_attribute *attr,
> > ?	int i;
> > ?
> > ?	BUG_ON(!virtio_has_feature(vblk->vdev,
> > VIRTIO_BLK_F_CONFIG_WCE));
> > -	for (i = ARRAY_SIZE(virtblk_cache_types); --i >= 0; )
> > -		if (sysfs_streq(buf, virtblk_cache_types[i]))
> > -			break;
> > -
> > +	i = sysfs_match_string(virtblk_cache_types, buf);
> > ?	if (i < 0)
> > -		return -EINVAL;
> > +		return i;
> > ?
> > ?	virtio_cwrite8(vdev, offsetof(struct virtio_blk_config, wce),
> > i);
> > ?	virtblk_update_cache_mode(vdev);
> 
> -- 
> Andy Shevchenko <andriy.shevchenko at linux.intel.com>
> Intel Finland Oy

On 2017?07?03? 20:05, Andy Shevchenko wrote:
> On Fri, 2017-06-09 at 15:07 +0300, Andy Shevchenko wrote:
>> Use sysfs_match_string() helper instead of open coded variant.
> Did I miss maintainer?
Nope :)

Reviewed-by: Jason Wang <jasowang at redhat.com>
>
>> Cc: "Michael S. Tsirkin" <mst at redhat.com>
>> Cc: Jason Wang <jasowang at redhat.com>
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko at
linux.intel.com>
>> ---
>>   drivers/block/virtio_blk.c | 7 ++-----
>>   1 file changed, 2 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
>> index 553cc4c542b4..0e707b8cce9d 100644
>> --- a/drivers/block/virtio_blk.c
>> +++ b/drivers/block/virtio_blk.c
>> @@ -541,12 +541,9 @@ virtblk_cache_type_store(struct device *dev,
>> struct device_attribute *attr,
>>   	int i;
>>   
>>   	BUG_ON(!virtio_has_feature(vblk->vdev,
>> VIRTIO_BLK_F_CONFIG_WCE));
>> -	for (i = ARRAY_SIZE(virtblk_cache_types); --i >= 0; )
>> -		if (sysfs_streq(buf, virtblk_cache_types[i]))
>> -			break;
>> -
>> +	i = sysfs_match_string(virtblk_cache_types, buf);
>>   	if (i < 0)
>> -		return -EINVAL;
>> +		return i;
>>   
>>   	virtio_cwrite8(vdev, offsetof(struct virtio_blk_config, wce),
>> i);
>>   	virtblk_update_cache_mode(vdev);