aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm/assigned-dev.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2011-09-11 04:16:16 -0400
committerAvi Kivity <avi@redhat.com>2011-09-25 12:52:38 -0400
commit9f9f6b78776be3de02e0c7533924e6954b918123 (patch)
tree6c03254c90c6ecf194858b3521fb6654996659cc /virt/kvm/assigned-dev.c
parente8f2b1d621e7b73c16aaae2ccf4a64d09a0f56d8 (diff)
KVM: Clean up unneeded void pointer casts
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'virt/kvm/assigned-dev.c')
-rw-r--r--virt/kvm/assigned-dev.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c
index 4e9eaeb518c7..ea1bf5d424ea 100644
--- a/virt/kvm/assigned-dev.c
+++ b/virt/kvm/assigned-dev.c
@@ -143,7 +143,7 @@ static void deassign_host_irq(struct kvm *kvm,
143 143
144 for (i = 0; i < assigned_dev->entries_nr; i++) 144 for (i = 0; i < assigned_dev->entries_nr; i++)
145 free_irq(assigned_dev->host_msix_entries[i].vector, 145 free_irq(assigned_dev->host_msix_entries[i].vector,
146 (void *)assigned_dev); 146 assigned_dev);
147 147
148 assigned_dev->entries_nr = 0; 148 assigned_dev->entries_nr = 0;
149 kfree(assigned_dev->host_msix_entries); 149 kfree(assigned_dev->host_msix_entries);
@@ -153,7 +153,7 @@ static void deassign_host_irq(struct kvm *kvm,
153 /* Deal with MSI and INTx */ 153 /* Deal with MSI and INTx */
154 disable_irq(assigned_dev->host_irq); 154 disable_irq(assigned_dev->host_irq);
155 155
156 free_irq(assigned_dev->host_irq, (void *)assigned_dev); 156 free_irq(assigned_dev->host_irq, assigned_dev);
157 157
158 if (assigned_dev->irq_requested_type & KVM_DEV_IRQ_HOST_MSI) 158 if (assigned_dev->irq_requested_type & KVM_DEV_IRQ_HOST_MSI)
159 pci_disable_msi(assigned_dev->dev); 159 pci_disable_msi(assigned_dev->dev);
@@ -237,7 +237,7 @@ static int assigned_device_enable_host_intx(struct kvm *kvm,
237 * are going to be long delays in accepting, acking, etc. 237 * are going to be long delays in accepting, acking, etc.
238 */ 238 */
239 if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread, 239 if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread,
240 IRQF_ONESHOT, dev->irq_name, (void *)dev)) 240 IRQF_ONESHOT, dev->irq_name, dev))
241 return -EIO; 241 return -EIO;
242 return 0; 242 return 0;
243} 243}
@@ -256,7 +256,7 @@ static int assigned_device_enable_host_msi(struct kvm *kvm,
256 256
257 dev->host_irq = dev->dev->irq; 257 dev->host_irq = dev->dev->irq;
258 if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread, 258 if (request_threaded_irq(dev->host_irq, NULL, kvm_assigned_dev_thread,
259 0, dev->irq_name, (void *)dev)) { 259 0, dev->irq_name, dev)) {
260 pci_disable_msi(dev->dev); 260 pci_disable_msi(dev->dev);
261 return -EIO; 261 return -EIO;
262 } 262 }
@@ -283,7 +283,7 @@ static int assigned_device_enable_host_msix(struct kvm *kvm,
283 for (i = 0; i < dev->entries_nr; i++) { 283 for (i = 0; i < dev->entries_nr; i++) {
284 r = request_threaded_irq(dev->host_msix_entries[i].vector, 284 r = request_threaded_irq(dev->host_msix_entries[i].vector,
285 NULL, kvm_assigned_dev_thread, 285 NULL, kvm_assigned_dev_thread,
286 0, dev->irq_name, (void *)dev); 286 0, dev->irq_name, dev);
287 if (r) 287 if (r)
288 goto err; 288 goto err;
289 } 289 }
@@ -291,7 +291,7 @@ static int assigned_device_enable_host_msix(struct kvm *kvm,
291 return 0; 291 return 0;
292err: 292err:
293 for (i -= 1; i >= 0; i--) 293 for (i -= 1; i >= 0; i--)
294 free_irq(dev->host_msix_entries[i].vector, (void *)dev); 294 free_irq(dev->host_msix_entries[i].vector, dev);
295 pci_disable_msix(dev->dev); 295 pci_disable_msix(dev->dev);
296 return r; 296 return r;
297} 297}