* [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings
@ 2012-02-22 16:04 Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 1/2] drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning Danny Kukawka
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Danny Kukawka @ 2012-02-22 16:04 UTC (permalink / raw)
To: Tejun Heo; +Cc: Danny Kukawka, Lucas De Marchi, Jens Axboe, linux-kernel
Two patches for DAC960. Please add to 3.3.
Please note: I didn't touch the code style/indentation of the file.
Danny Kukawka (2):
drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning
drivers/block/DAC960: fix -Wuninitialized warning
drivers/block/DAC960.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
--
1.7.8.3
^ permalink raw reply [flat|nested] 4+ messages in thread
* [RESEND][PATCH 1/2] drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning
2012-02-22 16:04 [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Danny Kukawka
@ 2012-02-22 16:04 ` Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 2/2] drivers/block/DAC960: fix -Wuninitialized warning Danny Kukawka
2012-03-02 9:48 ` [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Jens Axboe
2 siblings, 0 replies; 4+ messages in thread
From: Danny Kukawka @ 2012-02-22 16:04 UTC (permalink / raw)
To: Tejun Heo; +Cc: Danny Kukawka, Lucas De Marchi, Jens Axboe, linux-kernel
Fixed compiler warning:
comparison between ‘DAC960_V2_IOCTL_Opcode_T’ and ‘enum <anonymous>’
Renamed enum, added a new enum for SCSI_10.CommandOpcode in
DAC960_V2_ProcessCompletedCommand().
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
drivers/block/DAC960.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index e086fbb..487ce64 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -4627,7 +4627,8 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
DAC960_Controller_T *Controller = Command->Controller;
DAC960_CommandType_T CommandType = Command->CommandType;
DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox;
- DAC960_V2_IOCTL_Opcode_T CommandOpcode = CommandMailbox->Common.IOCTL_Opcode;
+ DAC960_V2_IOCTL_Opcode_T IOCTLOpcode = CommandMailbox->Common.IOCTL_Opcode;
+ DAC960_V2_CommandOpcode_T CommandOpcode = CommandMailbox->SCSI_10.CommandOpcode;
DAC960_V2_CommandStatus_T CommandStatus = Command->V2.CommandStatus;
if (CommandType == DAC960_ReadCommand ||
@@ -4699,7 +4700,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
{
if (Controller->ShutdownMonitoringTimer)
return;
- if (CommandOpcode == DAC960_V2_GetControllerInfo)
+ if (IOCTLOpcode == DAC960_V2_GetControllerInfo)
{
DAC960_V2_ControllerInfo_T *NewControllerInfo =
Controller->V2.NewControllerInformation;
@@ -4719,14 +4720,14 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
memcpy(ControllerInfo, NewControllerInfo,
sizeof(DAC960_V2_ControllerInfo_T));
}
- else if (CommandOpcode == DAC960_V2_GetEvent)
+ else if (IOCTLOpcode == DAC960_V2_GetEvent)
{
if (CommandStatus == DAC960_V2_NormalCompletion) {
DAC960_V2_ReportEvent(Controller, Controller->V2.Event);
}
Controller->V2.NextEventSequenceNumber++;
}
- else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid &&
+ else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid &&
CommandStatus == DAC960_V2_NormalCompletion)
{
DAC960_V2_PhysicalDeviceInfo_T *NewPhysicalDeviceInfo =
@@ -4915,7 +4916,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
NewPhysicalDeviceInfo->LogicalUnit++;
Controller->V2.PhysicalDeviceIndex++;
}
- else if (CommandOpcode == DAC960_V2_GetPhysicalDeviceInfoValid)
+ else if (IOCTLOpcode == DAC960_V2_GetPhysicalDeviceInfoValid)
{
unsigned int DeviceIndex;
for (DeviceIndex = Controller->V2.PhysicalDeviceIndex;
@@ -4938,7 +4939,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
}
Controller->V2.NeedPhysicalDeviceInformation = false;
}
- else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid &&
+ else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid &&
CommandStatus == DAC960_V2_NormalCompletion)
{
DAC960_V2_LogicalDeviceInfo_T *NewLogicalDeviceInfo =
@@ -5065,7 +5066,7 @@ static void DAC960_V2_ProcessCompletedCommand(DAC960_Command_T *Command)
[LogicalDeviceNumber] = true;
NewLogicalDeviceInfo->LogicalDeviceNumber++;
}
- else if (CommandOpcode == DAC960_V2_GetLogicalDeviceInfoValid)
+ else if (IOCTLOpcode == DAC960_V2_GetLogicalDeviceInfoValid)
{
int LogicalDriveNumber;
for (LogicalDriveNumber = 0;
--
1.7.8.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [RESEND][PATCH 2/2] drivers/block/DAC960: fix -Wuninitialized warning
2012-02-22 16:04 [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 1/2] drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning Danny Kukawka
@ 2012-02-22 16:04 ` Danny Kukawka
2012-03-02 9:48 ` [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Jens Axboe
2 siblings, 0 replies; 4+ messages in thread
From: Danny Kukawka @ 2012-02-22 16:04 UTC (permalink / raw)
To: Tejun Heo; +Cc: Danny Kukawka, Lucas De Marchi, Jens Axboe, linux-kernel
Set CommandMailbox with memset before use it. Fix for:
drivers/block/DAC960.c: In function ‘DAC960_V1_EnableMemoryMailboxInterface’:
arch/x86/include/asm/io.h:61:1: warning: ‘CommandMailbox.Bytes[12]’
may be used uninitialized in this function [-Wuninitialized]
drivers/block/DAC960.c:1175:30: note: ‘CommandMailbox.Bytes[12]’
was declared here
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
---
drivers/block/DAC960.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 487ce64..8db9089 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -1177,7 +1177,8 @@ static bool DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
int TimeoutCounter;
int i;
-
+ memset(&CommandMailbox, 0, sizeof(DAC960_V1_CommandMailbox_T));
+
if (pci_set_dma_mask(Controller->PCIDevice, DMA_BIT_MASK(32)))
return DAC960_Failure(Controller, "DMA mask out of range");
Controller->BounceBufferLimit = DMA_BIT_MASK(32);
--
1.7.8.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings
2012-02-22 16:04 [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 1/2] drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 2/2] drivers/block/DAC960: fix -Wuninitialized warning Danny Kukawka
@ 2012-03-02 9:48 ` Jens Axboe
2 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2012-03-02 9:48 UTC (permalink / raw)
To: Danny Kukawka; +Cc: Tejun Heo, Danny Kukawka, Lucas De Marchi, linux-kernel
On 02/22/2012 05:04 PM, Danny Kukawka wrote:
> Two patches for DAC960. Please add to 3.3.
>
> Please note: I didn't touch the code style/indentation of the file.
Thanks, applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-03-02 9:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-22 16:04 [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 1/2] drivers/block/DAC960: fix DAC960_V2_IOCTL_Opcode_T -Wenum-compare warning Danny Kukawka
2012-02-22 16:04 ` [RESEND][PATCH 2/2] drivers/block/DAC960: fix -Wuninitialized warning Danny Kukawka
2012-03-02 9:48 ` [RESEND][PATCH 0/2] drivers/block/DAC960: fix some compiler warnings Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.