d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atkbdc: clean up empty lines in .c and .h files

Browse Source
This commit is contained in:
Mateusz Guzik 2020-09-01 21:41:38 +00:00
parent 9966c0f962
commit bf479e1372
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365117
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/atkbdc/atkbd.c
View File

@ -314,7 +314,7 @@ atkbd_configure(int flags)
}
return 0;
}
/* XXX: a kludge to obtain the device configuration flags */
if (resource_int_value("atkbd", ATKBD_DEFAULT, "flags", &i) == 0)
flags |= i;
@ -427,7 +427,7 @@ atkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
imin(fkeymap_size * sizeof(fkeymap[0]), sizeof(fkey_tab)));
kbd_set_maps(kbd, keymap, accmap, fkeymap, fkeymap_size);
kbd->kb_data = (void *)state;
if (probe_keyboard(state->kbdc, flags)) { /* shouldn't happen */
if (flags & KB_CONF_FAIL_IF_NO_KBD) {
error = ENXIO;
@ -928,7 +928,6 @@ atkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t arg)
s = spltty();
switch (cmd) {
case KDGKBMODE: /* get keyboard mode */
*(int *)arg = state->ks_mode;
break;
@ -1386,7 +1385,7 @@ init_keyboard(KBDC kbdc, int *type, int flags)
if (bootverbose)
printf("atkbd: scancode set %d\n", codeset);
#endif /* KBD_DETECT_XT_KEYBOARD */
*type = KB_OTHER;
id = get_kbd_id(kbdc);
switch(id) {

1
sys/dev/atkbdc/atkbdc.c
View File

@ -116,7 +116,6 @@ static struct atkbdc_quirks quirks[] = {
{"coreboot", NULL, NULL,
KBDC_QUIRK_KEEP_ACTIVATED | KBDC_QUIRK_IGNORE_PROBE_RESULT |
KBDC_QUIRK_RESET_AFTER_PROBE | KBDC_QUIRK_SETLEDS_ON_INIT},
{NULL, NULL, NULL, 0}
};

5
sys/dev/atkbdc/atkbdc_isa.c
View File

@ -77,7 +77,6 @@ static device_method_t atkbdc_isa_methods[] = {
DEVMETHOD(bus_delete_resource, bus_generic_rl_delete_resource),
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
{ 0, 0 }
};
@ -300,7 +299,7 @@ atkbdc_isa_alloc_resource(device_t dev, device_t child, int type, int *rid,
rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
{
atkbdc_softc_t *sc;
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (type == SYS_RES_IRQ && *rid == KBDC_RID_KBD && sc->irq != NULL)
return (sc->irq);
@ -313,7 +312,7 @@ atkbdc_isa_release_resource(device_t dev, device_t child, int type, int rid,
struct resource *r)
{
atkbdc_softc_t *sc;
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (type == SYS_RES_IRQ && rid == KBDC_RID_KBD && r == sc->irq)
return (0);

6
sys/dev/atkbdc/psm.c
View File

@ -727,7 +727,6 @@ static device_method_t psm_methods[] = {
DEVMETHOD(device_attach, psmattach),
DEVMETHOD(device_detach, psmdetach),
DEVMETHOD(device_resume, psmresume),
{ 0, 0 }
};
@ -1691,7 +1690,6 @@ psmprobe(device_t dev)
#define PS2_MOUSE_ELANTECH_NAME "ETPS/2 Elantech Touchpad"
#define PS2_MOUSE_ELANTECH_ST_NAME "ETPS/2 Elantech TrackPoint"
#define PS2_MOUSE_ELANTECH_PRODUCT 0x000E
#define ABSINFO_END { ABS_CNT, 0, 0, 0 }
static void
@ -2629,7 +2627,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
/* Perform IOCTL command */
switch (cmd) {
case OLD_MOUSE_GETHWINFO:
s = spltty();
((old_mousehw_t *)addr)->buttons = sc->hw.buttons;
@ -4716,7 +4713,6 @@ proc_elantech(struct psm_softc *sc, packetbuf_t *pb, mousestatus_t *ms,
!(pb->ipacket[0] & 0x10) != !(pb->ipacket[3] & 0x10) &&
!(pb->ipacket[0] & 0x20) != !(pb->ipacket[2] & 0x80) &&
!(pb->ipacket[0] & 0x20) != !(pb->ipacket[3] & 0x20)) {
*x = (pb->ipacket[0] & MOUSE_PS2_XNEG) ?
pb->ipacket[4] - 256 : pb->ipacket[4];
*y = (pb->ipacket[0] & MOUSE_PS2_YNEG) ?
@ -4982,7 +4978,6 @@ psmsoftintr(void *arg)
sc->idlepacket.inputbytes = 0;
switch (sc->hw.model) {
case MOUSE_MODEL_EXPLORER:
/*
* b7 b6 b5 b4 b3 b2 b1 b0
@ -7489,7 +7484,6 @@ static device_attach_t psmcpnp_attach;
static device_method_t psmcpnp_methods[] = {
DEVMETHOD(device_probe, psmcpnp_probe),
DEVMETHOD(device_attach, psmcpnp_attach),
{ 0, 0 }
};