~hc/RK356X_SDK_RELEASE.git

..	..	@@ -55,9 +55,7 @@
55	55	#include <linux/io.h>
56	56	#include <linux/uaccess.h>
57	57
58		-#include <misc/charlcd.h>
59		-
60		-#define KEYPAD_MINOR 185
	58	+#include "charlcd.h"
61	59
62	60	#define LCD_MAXBYTES 256 /* max burst write */
63	61
..	..	@@ -155,10 +153,9 @@
155	153	int release_data;
156	154	} std;
157	155	struct { /* valid when type == INPUT_TYPE_KBD */
158		- /* strings can be non null-terminated */
159		- char press_str[sizeof(void *) + sizeof(int)];
160		- char repeat_str[sizeof(void *) + sizeof(int)];
161		- char release_str[sizeof(void *) + sizeof(int)];
	156	+ char press_str[sizeof(void *) + sizeof(int)] __nonstring;
	157	+ char repeat_str[sizeof(void *) + sizeof(int)] __nonstring;
	158	+ char release_str[sizeof(void *) + sizeof(int)] __nonstring;
162	159	} kbd;
163	160	} u;
164	161	};
..	..	@@ -1368,7 +1365,7 @@
1368	1365	break;
1369	1366	input->rise_timer = 0;
1370	1367	input->state = INPUT_ST_RISING;
1371		- /* fall through */
	1368	+ fallthrough;
1372	1369	case INPUT_ST_RISING:
1373	1370	if ((phys_curr & input->mask) != input->value) {
1374	1371	input->state = INPUT_ST_LOW;
..	..	@@ -1381,11 +1378,11 @@
1381	1378	}
1382	1379	input->high_timer = 0;
1383	1380	input->state = INPUT_ST_HIGH;
1384		- /* fall through */
	1381	+ fallthrough;
1385	1382	case INPUT_ST_HIGH:
1386	1383	if (input_state_high(input))
1387	1384	break;
1388		- /* fall through */
	1385	+ fallthrough;
1389	1386	case INPUT_ST_FALLING:
1390	1387	input_state_falling(input);
1391	1388	}
..	..	@@ -1623,7 +1620,7 @@
1623	1620	if (lcd.enabled)
1624	1621	charlcd_unregister(lcd.charlcd);
1625	1622	err_unreg_device:
1626		- kfree(lcd.charlcd);
	1623	+ charlcd_free(lcd.charlcd);
1627	1624	lcd.charlcd = NULL;
1628	1625	parport_unregister_device(pprt);
1629	1626	pprt = NULL;
..	..	@@ -1650,7 +1647,7 @@
1650	1647	if (lcd.enabled) {
1651	1648	charlcd_unregister(lcd.charlcd);
1652	1649	lcd.initialized = false;
1653		- kfree(lcd.charlcd);
	1650	+ charlcd_free(lcd.charlcd);
1654	1651	lcd.charlcd = NULL;
1655	1652	}
1656	1653