Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f8343685643f2901fe11aa9d0358cafbeaf7b4c3

Authored by Yoann Padioleau
Committed by Linus Torvalds
1 parent 632155e659
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, 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, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

parse errors in ifdefs 

Fix various bits of obviously-busted code which we're not happening to
compile, due to ifdefs.

Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Jan Kara <jack@ucw.cz>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

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

Documentation/ia64/aliasing-test.c
Diff comments   View file @ f834368
... ... @@ -197,7 +197,7 @@
197 197 return rc;
198 198 }
199 199  
200   -main()
  200 +int main()
201 201 {
202 202 int rc;
203 203  
arch/alpha/boot/tools/mkbb.c
Diff comments   View file @ f834368
... ... @@ -81,7 +81,7 @@
81 81 #define bootblock_label __u1.__label
82 82 #define bootblock_checksum __u2.__checksum
83 83  
84   -main(int argc, char ** argv)
  84 +int main(int argc, char ** argv)
85 85 {
86 86 bootblock bootblock_from_disk;
87 87 bootblock bootloader_image;
arch/arm/mm/alignment.c
Diff comments   View file @ f834368
... ... @@ -630,7 +630,7 @@
630 630  
631 631 fs = get_fs();
632 632 set_fs(KERNEL_DS);
633   - if thumb_mode(regs) {
  633 + if (thumb_mode(regs)) {
634 634 fault = __get_user(tinstr, (u16 *)(instrptr & ~1));
635 635 if (!(fault))
636 636 instr = thumb2arm(tinstr);
arch/mips/jmr3927/rbhma3100/kgdb_io.c
Diff comments   View file @ f834368
... ... @@ -36,7 +36,7 @@
36 36 #define TIMEOUT 0xffffff
37 37  
38 38 static int remoteDebugInitialized = 0;
39   -static void debugInit(int baud)
  39 +static void debugInit(int baud);
40 40  
41 41 int putDebugChar(unsigned char c)
42 42 {
arch/mips/pci/pci-ocelot.c
Diff comments   View file @ f834368
... ... @@ -71,19 +71,19 @@
71 71 }
72 72  
73 73 static struct resource ocelot_mem_resource = {
74   - start = GT_PCI_MEM_BASE;
75   - end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;
  74 + .start = GT_PCI_MEM_BASE,
  75 + .end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1,
76 76 };
77 77  
78 78 static struct resource ocelot_io_resource = {
79   - start = GT_PCI_IO_BASE;
80   - end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;
  79 + .start = GT_PCI_IO_BASE,
  80 + .end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1,
81 81 };
82 82  
83 83 static struct pci_controller ocelot_pci_controller = {
84   - .pci_ops = gt64xxx_pci0_ops;
85   - .mem_resource = &ocelot_mem_resource;
86   - .io_resource = &ocelot_io_resource;
  84 + .pci_ops = gt64xxx_pci0_ops,
  85 + .mem_resource = &ocelot_mem_resource,
  86 + .io_resource = &ocelot_io_resource,
87 87 };
88 88  
89 89 static int __init ocelot_pcibios_init(void)
drivers/mtd/nand/ppchameleonevb.c
Diff comments   View file @ f834368
... ... @@ -424,9 +424,9 @@
424 424  
425 425 /* Release iomaps */
426 426 this = (struct nand_chip *) &ppchameleon_mtd[1];
427   - iounmap((void *) this->IO_ADDR_R;
  427 + iounmap((void *) this->IO_ADDR_R);
428 428 this = (struct nand_chip *) &ppchameleonevb_mtd[1];
429   - iounmap((void *) this->IO_ADDR_R;
  429 + iounmap((void *) this->IO_ADDR_R);
430 430  
431 431 /* Free the MTD device structure */
432 432 kfree (ppchameleon_mtd);
drivers/net/fec_8xx/fec_main.c
Diff comments   View file @ f834368
... ... @@ -550,7 +550,7 @@
550 550 skbn = dev_alloc_skb(pkt_len + 2);
551 551 if (skbn != NULL) {
552 552 skb_reserve(skbn, 2); /* align IP header */
553   - skb_copy_from_linear_data(skb
  553 + skb_copy_from_linear_data(skb,
554 554 skbn->data,
555 555 pkt_len);
556 556 /* swap */
drivers/scsi/NCR5380.c
Diff comments   View file @ f834368
... ... @@ -2625,7 +2625,7 @@
2625 2625 #ifdef REAL_DMA
2626 2626 static void NCR5380_dma_complete(NCR5380_instance * instance) {
2627 2627 NCR5380_local_declare();
2628   - struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata * instance->hostdata);
  2628 + struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
2629 2629 int transferred;
2630 2630 NCR5380_setup(instance);
2631 2631  
... ... @@ -1351,7 +1351,7 @@
1351 1351  
1352 1352 for (i=0; i<UDF_SB_NUMPARTS(sb); i++)
1353 1353 {
1354   - switch UDF_SB_PARTTYPE(sb, i)
  1354 + switch (UDF_SB_PARTTYPE(sb, i))
1355 1355 {
1356 1356 case UDF_VIRTUAL_MAP15:
1357 1357 case UDF_VIRTUAL_MAP20: