@@ -226,9 +226,8 @@ struct vmstor_protocol {
int vmscsi_size_delta;
};
-#define VMSTOR_NUM_PROTOCOLS 5
-const struct vmstor_protocol vmstor_protocols[VMSTOR_NUM_PROTOCOLS] = {
+const struct vmstor_protocol vmstor_protocols[] = {
{
VMSTOR_PROTO_VERSION_WIN10,
POST_WIN7_STORVSC_SENSE_BUFFER_SIZE,
@@ -959,7 +958,7 @@ static int storvsc_channel_init(struct hv_device *device)
}
- for (i = 0; i < VMSTOR_NUM_PROTOCOLS; i++) {
+ for (i = 0; i < ARRAY_SIZE(vmstor_protocols); i++) {
/* reuse the packet for version range supported */
memset(vstor_packet, 0, sizeof(struct vstor_packet));
vstor_packet->operation =
Rather than hard coding the number of elements in the array, use the ARRAY_SIZE() macro to compute the number of elements in the array. This would minimize the changes needed when we have to extend the protocols supported. This was suggested by Johannes Thumshirn <jthumshirn@suse.de>. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> --- drivers/scsi/storvsc_drv.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)