Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9e108d33edcb88bac3db39ba1683fc2c0591d7d4

Authored by Liam Girdwood
1 parent 040932cdcf
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

regulator: tps650xx - build fixes for x86_64 

Fixes the following errors on both tps650xx regulator drivers :-

drivers/regulator/tps65023-regulator: struct i2c_device_id is 32 bytes.  The last of 1 is:
0x74 0x70 0x73 0x36 0x35 0x30 0x32 0x33 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
FATAL: drivers/regulator/tps65023-regulator: struct i2c_device_id is not terminated with a NULL entry!

This patch also fixes the GPL v2 licence string for both drivers.

Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

Showing 2 changed files with 12 additions and 10 deletions Side-by-side Diff

drivers/regulator/tps65023-regulator.c
Diff comments   View file @ 9e108d3
... ... @@ -587,9 +587,10 @@
587 587 },
588 588 };
589 589  
590   -static const struct i2c_device_id tps_65023_id = {
591   - .name = "tps65023",
592   - .driver_data = (unsigned long) &tps65023_regs[0],
  590 +static const struct i2c_device_id tps_65023_id[] = {
  591 + {.name = "tps65023",
  592 + .driver_data = (unsigned long) tps65023_regs,},
  593 + { },
593 594 };
594 595  
595 596 MODULE_DEVICE_TABLE(i2c, tps_65023_id);
... ... @@ -601,7 +602,7 @@
601 602 },
602 603 .probe = tps_65023_probe,
603 604 .remove = __devexit_p(tps_65023_remove),
604   - .id_table = &tps_65023_id,
  605 + .id_table = tps_65023_id,
605 606 };
606 607  
607 608 /**
... ... @@ -628,5 +629,5 @@
628 629  
629 630 MODULE_AUTHOR("Texas Instruments");
630 631 MODULE_DESCRIPTION("TPS65023 voltage regulator driver");
631   -MODULE_LICENSE("GPLv2");
  632 +MODULE_LICENSE("GPL v2");
drivers/regulator/tps6507x-regulator.c
Diff comments   View file @ 9e108d3
... ... @@ -670,9 +670,10 @@
670 670 },
671 671 };
672 672  
673   -static const struct i2c_device_id tps_6507x_id = {
674   - .name = "tps6507x",
675   - .driver_data = (unsigned long) &tps6507x_regs[0],
  673 +static const struct i2c_device_id tps_6507x_id[] = {
  674 + {.name = "tps6507x",
  675 + .driver_data = (unsigned long) tps6507x_regs,},
  676 + { },
676 677 };
677 678 MODULE_DEVICE_TABLE(i2c, tps_6507x_id);
678 679  
... ... @@ -683,7 +684,7 @@
683 684 },
684 685 .probe = tps_6507x_probe,
685 686 .remove = __devexit_p(tps_6507x_remove),
686   - .id_table = &tps_6507x_id,
  687 + .id_table = tps_6507x_id,
687 688 };
688 689  
689 690 /**
... ... @@ -710,5 +711,5 @@
710 711  
711 712 MODULE_AUTHOR("Texas Instruments");
712 713 MODULE_DESCRIPTION("TPS6507x voltage regulator driver");
713   -MODULE_LICENSE("GPLv2");
  714 +MODULE_LICENSE("GPL v2");