Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e108d33 authored by Liam Girdwood's avatar Liam Girdwood
Browse files

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: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 040932cd

drivers/regulator/tps65023-regulator.c

+6 −5
Original line number Diff line number Diff line
@@ -587,9 +587,10 @@ static const struct tps_info tps65023_regs[] = { 
	},

};



static const struct i2c_device_id tps_65023_id = {

	.name = "tps65023",

	.driver_data = (unsigned long) &tps65023_regs[0],

static const struct i2c_device_id tps_65023_id[] = {

	{.name = "tps65023",

	.driver_data = (unsigned long) tps65023_regs,},

	{ },

};



MODULE_DEVICE_TABLE(i2c, tps_65023_id);
@@ -601,7 +602,7 @@ static struct i2c_driver tps_65023_i2c_driver = { 
	},

	.probe = tps_65023_probe,

	.remove = __devexit_p(tps_65023_remove),

	.id_table = &tps_65023_id,

	.id_table = tps_65023_id,

};



/**

drivers/regulator/tps6507x-regulator.c

+6 −5
Original line number Diff line number Diff line
@@ -670,9 +670,10 @@ static const struct tps_info tps6507x_regs[] = { 
	},

};



static const struct i2c_device_id tps_6507x_id = {

	.name = "tps6507x",

	.driver_data = (unsigned long) &tps6507x_regs[0],

static const struct i2c_device_id tps_6507x_id[] = {

	{.name = "tps6507x",

	.driver_data = (unsigned long) tps6507x_regs,},

	{ },

};

MODULE_DEVICE_TABLE(i2c, tps_6507x_id);
@@ -683,7 +684,7 @@ static struct i2c_driver tps_6507x_i2c_driver = { 
	},

	.probe = tps_6507x_probe,

	.remove = __devexit_p(tps_6507x_remove),

	.id_table = &tps_6507x_id,

	.id_table = tps_6507x_id,

};



/**