Commit c7fc8da0 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k SCSI warnings

M68k SCSI drivers: Kill warnings caused by implicit conversions from volatile *
and remove some unneeded casts
parent d63ffc22
...@@ -1463,9 +1463,9 @@ NCR53c7x0_init_fixup (struct Scsi_Host *host) { ...@@ -1463,9 +1463,9 @@ NCR53c7x0_init_fixup (struct Scsi_Host *host) {
patch_abs_32 (hostdata->script, 0, test_src, patch_abs_32 (hostdata->script, 0, test_src,
virt_to_bus(&hostdata->test_source)); virt_to_bus(&hostdata->test_source));
patch_abs_32 (hostdata->script, 0, saved_dsa, patch_abs_32 (hostdata->script, 0, saved_dsa,
virt_to_bus(&hostdata->saved2_dsa)); virt_to_bus((void *)&hostdata->saved2_dsa));
patch_abs_32 (hostdata->script, 0, emulfly, patch_abs_32 (hostdata->script, 0, emulfly,
virt_to_bus(&hostdata->emulated_intfly)); virt_to_bus((void *)&hostdata->emulated_intfly));
patch_abs_rwri_data (hostdata->script, 0, dsa_check_reselect, patch_abs_rwri_data (hostdata->script, 0, dsa_check_reselect,
(unsigned char)(Ent_dsa_code_check_reselect - Ent_dsa_zero)); (unsigned char)(Ent_dsa_code_check_reselect - Ent_dsa_zero));
......
...@@ -167,8 +167,8 @@ int __init blz1230_esp_detect(Scsi_Host_Template *tpnt) ...@@ -167,8 +167,8 @@ int __init blz1230_esp_detect(Scsi_Host_Template *tpnt)
esp->eregs = eregs; esp->eregs = eregs;
/* Set the command buffer */ /* Set the command buffer */
esp->esp_command = (volatile unsigned char*) cmd_buffer; esp->esp_command = cmd_buffer;
esp->esp_command_dvma = virt_to_bus(cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+REAL_BLZ1230_ESP_ADDR; esp->slot = board+REAL_BLZ1230_ESP_ADDR;
......
...@@ -142,8 +142,8 @@ int __init blz2060_esp_detect(Scsi_Host_Template *tpnt) ...@@ -142,8 +142,8 @@ int __init blz2060_esp_detect(Scsi_Host_Template *tpnt)
esp->eregs = (struct ESP_regs *)(address + BLZ2060_ESP_ADDR); esp->eregs = (struct ESP_regs *)(address + BLZ2060_ESP_ADDR);
/* Set the command buffer */ /* Set the command buffer */
esp->esp_command = (volatile unsigned char*) cmd_buffer; esp->esp_command = cmd_buffer;
esp->esp_command_dvma = virt_to_bus(cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
......
...@@ -168,8 +168,8 @@ int __init cyber_esp_detect(Scsi_Host_Template *tpnt) ...@@ -168,8 +168,8 @@ int __init cyber_esp_detect(Scsi_Host_Template *tpnt)
esp->eregs = (struct ESP_regs *)(address + CYBER_ESP_ADDR); esp->eregs = (struct ESP_regs *)(address + CYBER_ESP_ADDR);
/* Set the command buffer */ /* Set the command buffer */
esp->esp_command = (volatile unsigned char*) cmd_buffer; esp->esp_command = cmd_buffer;
esp->esp_command_dvma = virt_to_bus(cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
......
...@@ -149,8 +149,8 @@ int __init cyberII_esp_detect(Scsi_Host_Template *tpnt) ...@@ -149,8 +149,8 @@ int __init cyberII_esp_detect(Scsi_Host_Template *tpnt)
esp->eregs = eregs; esp->eregs = eregs;
/* Set the command buffer */ /* Set the command buffer */
esp->esp_command = (volatile unsigned char*) cmd_buffer; esp->esp_command = cmd_buffer;
esp->esp_command_dvma = virt_to_bus(cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ, request_irq(IRQ_AMIGA_PORTS, esp_intr, SA_SHIRQ,
......
...@@ -191,8 +191,8 @@ int __init fastlane_esp_detect(Scsi_Host_Template *tpnt) ...@@ -191,8 +191,8 @@ int __init fastlane_esp_detect(Scsi_Host_Template *tpnt)
esp->edev = (void *) address; esp->edev = (void *) address;
/* Set the command buffer */ /* Set the command buffer */
esp->esp_command = (volatile unsigned char*) cmd_buffer; esp->esp_command = cmd_buffer;
esp->esp_command_dvma = virt_to_bus(cmd_buffer); esp->esp_command_dvma = virt_to_bus((void *)cmd_buffer);
esp->irq = IRQ_AMIGA_PORTS; esp->irq = IRQ_AMIGA_PORTS;
esp->slot = board+FASTLANE_ESP_ADDR; esp->slot = board+FASTLANE_ESP_ADDR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment