From: Don Brace Date: Thu, 20 Dec 2018 19:32:12 -0500 Subject: scsi: smartpqi: fix build warnings Git-commit: e52c9e0710d2f5d54a521d620a230ac2ae646dc7 Patch-mainline: v5.0-rc1 References: bsc#1133547 Fix kbuild warning and fallout from linux-next -Wimplicit-fallthrough. [mkp: added fall through statements] Signed-off-by: Don Brace Signed-off-by: Martin K. Petersen Acked-by: Lee Duncan --- drivers/scsi/smartpqi/smartpqi_init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index bfd2dd3496da..39f8cf8449d5 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -476,6 +476,7 @@ static int pqi_build_raid_path_request(struct pqi_ctrl_info *ctrl_info, break; case BMIC_SENSE_DIAG_OPTIONS: cdb_length = 0; + /* fall through */ case BMIC_IDENTIFY_CONTROLLER: case BMIC_IDENTIFY_PHYSICAL_DEVICE: request->data_direction = SOP_READ_FLAG; @@ -485,6 +486,7 @@ static int pqi_build_raid_path_request(struct pqi_ctrl_info *ctrl_info, break; case BMIC_SET_DIAG_OPTIONS: cdb_length = 0; + /* fall through */ case BMIC_WRITE_HOST_WELLNESS: request->data_direction = SOP_WRITE_FLAG; cdb[0] = BMIC_WRITE; @@ -7468,7 +7470,7 @@ static int pqi_ofa_alloc_mem(struct pqi_ctrl_info *ctrl_info, dev = &ctrl_info->pci_dev->dev; sg_count = (total_size + chunk_size - 1); - do_div(sg_count, chunk_size); + sg_count /= chunk_size; ofap = ctrl_info->pqi_ofa_mem_virt_addr;