Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6ec5ff4bc3a90b7716eadc4c8a686e904131f03a

Authored by Gustavo F. Padovan
Committed by Ingo Molnar
1 parent 1d487624fc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86: Eliminate various 'set but not used' warnings 

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Cc: Joerg Roedel <joerg.roedel@amd.com> (supporter:AMD IOMMU (AMD-VI))
Cc: iommu@lists.linux-foundation.org (open list:AMD IOMMU (AMD-VI))
Link: http://lkml.kernel.org/r/1305918786-7239-3-git-send-email-padovan@profusion.mobi
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 3 changed files with 5 additions and 16 deletions Side-by-side Diff

arch/x86/kernel/amd_iommu.c
Diff comments   View file @ 6ec5ff4
... ... @@ -1538,13 +1538,11 @@
1538 1538 {
1539 1539 struct iommu_dev_data *dev_data;
1540 1540 struct amd_iommu *iommu;
1541   - struct pci_dev *pdev;
1542 1541 u16 devid;
1543 1542  
1544 1543 devid = get_device_id(dev);
1545 1544 iommu = amd_iommu_rlookup_table[devid];
1546 1545 dev_data = get_dev_data(dev);
1547   - pdev = to_pci_dev(dev);
1548 1546  
1549 1547 /* decrease reference counters */
1550 1548 dev_data->domain->dev_iommu[iommu->index] -= 1;
1551 1549  
... ... @@ -1703,10 +1701,9 @@
1703 1701 struct protection_domain *dom;
1704 1702 struct iommu_dev_data *dev_data, *alias_data;
1705 1703 unsigned long flags;
1706   - u16 devid, alias;
  1704 + u16 devid;
1707 1705  
1708 1706 devid = get_device_id(dev);
1709   - alias = amd_iommu_alias_table[devid];
1710 1707 dev_data = get_dev_data(dev);
1711 1708 alias_data = get_dev_data(dev_data->alias);
1712 1709 if (!alias_data)
arch/x86/kernel/test_nx.c
Diff comments   View file @ 6ec5ff4
... ... @@ -161,7 +161,7 @@
161 161 }
162 162  
163 163 #endif
164   - return 0;
  164 + return ret;
165 165 }
166 166  
167 167 static void test_exit(void)
... ... @@ -414,22 +414,17 @@
414 414 unsigned char *p;
415 415 struct prefix_bits prf;
416 416 int i;
417   - unsigned long rv;
418 417  
419 418 p = (unsigned char *)ins_addr;
420 419 p += skip_prefix(p, &prf);
421 420 p += get_opcode(p, &opcode);
422 421 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
423   - if (reg_rop[i] == opcode) {
424   - rv = REG_READ;
  422 + if (reg_rop[i] == opcode)
425 423 goto do_work;
426   - }
427 424  
428 425 for (i = 0; i < ARRAY_SIZE(reg_wop); i++)
429   - if (reg_wop[i] == opcode) {
430   - rv = REG_WRITE;
  426 + if (reg_wop[i] == opcode)
431 427 goto do_work;
432   - }
433 428  
434 429 printk(KERN_ERR "mmiotrace: Not a register instruction, opcode "
435 430 "0x%02x\n", opcode);
436 431  
437 432  
... ... @@ -474,16 +469,13 @@
474 469 unsigned char *p;
475 470 struct prefix_bits prf;
476 471 int i;
477   - unsigned long rv;
478 472  
479 473 p = (unsigned char *)ins_addr;
480 474 p += skip_prefix(p, &prf);
481 475 p += get_opcode(p, &opcode);
482 476 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
483   - if (imm_wop[i] == opcode) {
484   - rv = IMM_WRITE;
  477 + if (imm_wop[i] == opcode)
485 478 goto do_work;
486   - }
487 479  
488 480 printk(KERN_ERR "mmiotrace: Not an immediate instruction, opcode "
489 481 "0x%02x\n", opcode);