From: Anil Ravindranath Date: Mon, 25 Oct 2010 22:41:54 +0000 (-0700) Subject: pmcraid: remove duplicate struct member X-Git-Tag: firefly_0821_release~9833^2~79^2^2~298 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=990a971cf6443839baad4660abb40844849b89d9;p=firefly-linux-kernel-4.4.55.git pmcraid: remove duplicate struct member commit df30e5059681ed0671c9cc6ff702fe9ca7f20042 upstream. sense_buffer is both a direct member of struct pmcraid_cmd as well as an indirect one via an anonymous union and struct. Fix this clash by eliminating the direct member in favour of the anonymous struct/union one. The name duplication apparently isn't noticed by gcc versions earlier than 4.4 Reported-by: Andi Kleen Signed-off-by: Anil Ravindranath Signed-off-by: James Bottomley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h index 6cfa0145a1d7..dd78f9e8eb9b 100644 --- a/drivers/scsi/pmcraid.h +++ b/drivers/scsi/pmcraid.h @@ -568,7 +568,6 @@ struct pmcraid_cmd { struct pmcraid_control_block *ioa_cb; dma_addr_t ioa_cb_bus_addr; dma_addr_t dma_handle; - u8 *sense_buffer; /* pointer to mid layer structure of SCSI commands */ struct scsi_cmnd *scsi_cmd;