From: Andrew Morton - fix a few of the checkpatch warnigns - make those stub functions static inline Cc: Arjan Opmeer Cc: Dmitry Torokhov Cc: Jiri Kosina Signed-off-by: Andrew Morton --- drivers/input/mouse/elantech.c | 8 ++++---- drivers/input/mouse/elantech.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/input/mouse/elantech.c~first-stab-at-elantech-touchpad-driver-for-26226-testers-fix drivers/input/mouse/elantech.c --- a/drivers/input/mouse/elantech.c~first-stab-at-elantech-touchpad-driver-for-26226-testers-fix +++ a/drivers/input/mouse/elantech.c @@ -53,7 +53,7 @@ static int elantech_write_reg(struct psm psmouse_sliced_command(psmouse, reg) || psmouse_sliced_command(psmouse, val) || ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSCALE11)) { - return -1; + return -1; } return 0; @@ -69,9 +69,8 @@ static psmouse_ret_t elantech_process_by unsigned char *packet = psmouse->packet; unsigned int z; - if (psmouse->pktcnt < 4) { + if (psmouse->pktcnt < 4) return PSMOUSE_GOOD_DATA; - } if (etd->reg_10 & ETP_RAW_MODE) { /* @@ -340,7 +339,8 @@ int elantech_init(struct psmouse *psmous struct elantech_data *priv; int error; - psmouse->private = priv = kzalloc(sizeof(struct elantech_data), GFP_KERNEL); + priv = kzalloc(sizeof(struct elantech_data), GFP_KERNEL); + psmouse->private = priv; if (!priv) return -1; diff -puN drivers/input/mouse/elantech.h~first-stab-at-elantech-touchpad-driver-for-26226-testers-fix drivers/input/mouse/elantech.h --- a/drivers/input/mouse/elantech.h~first-stab-at-elantech-touchpad-driver-for-26226-testers-fix +++ a/drivers/input/mouse/elantech.h @@ -31,13 +31,13 @@ struct elantech_data { int elantech_detect(struct psmouse *psmouse, int set_properties); int elantech_init(struct psmouse *psmouse); #else -inline int elantech_detect(struct psmouse *psmouse, int set_properties) +static inline int elantech_detect(struct psmouse *psmouse, int set_properties) { - return -ENOSYS; + return -ENOSYS; } -inline int elantech_init(struct psmouse *psmouse) +static inline int elantech_init(struct psmouse *psmouse) { - return -ENOSYS; + return -ENOSYS; } #endif /* CONFIG_MOUSE_PS2_ELANTECH */ _