diff options
author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:50:31 +0000 |
---|---|---|
committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 21:50:31 +0000 |
commit | 0d7f4d16dd008b620c0fc19b83fb7d78e9464c69 (patch) | |
tree | 85d53212a814517749fc34d5c963b7599538a8bc /sys/dev/tpm | |
parent | 93a6b43939ba2542ed3a1843a8fe1236108f69a4 (diff) | |
download | src-0d7f4d16dd008b620c0fc19b83fb7d78e9464c69.tar.gz src-0d7f4d16dd008b620c0fc19b83fb7d78e9464c69.zip |
tpm: clean up empty lines in .c and .h files
Notes
Notes:
svn path=/head/; revision=365144
Diffstat (limited to 'sys/dev/tpm')
-rw-r--r-- | sys/dev/tpm/tpm.c | 5 | ||||
-rw-r--r-- | sys/dev/tpm/tpm20.c | 3 | ||||
-rw-r--r-- | sys/dev/tpm/tpm20.h | 1 | ||||
-rw-r--r-- | sys/dev/tpm/tpm_acpi.c | 4 | ||||
-rw-r--r-- | sys/dev/tpm/tpm_crb.c | 1 | ||||
-rw-r--r-- | sys/dev/tpm/tpm_tis.c | 1 |
6 files changed, 2 insertions, 13 deletions
diff --git a/sys/dev/tpm/tpm.c b/sys/dev/tpm/tpm.c index 6fa86cd614f5..a458804d0ac9 100644 --- a/sys/dev/tpm/tpm.c +++ b/sys/dev/tpm/tpm.c @@ -146,7 +146,6 @@ __FBSDID("$FreeBSD$"); /* Set when enabling legacy interface in host bridge. */ int tpm_enabled; - #ifdef __FreeBSD__ #define TPMSOFTC(dev) \ ((struct tpm_softc *)dev->si_drv1) @@ -244,7 +243,6 @@ tpm_identify(driver_t *driver, device_t parent) } #endif - int tpm_attach(device_t dev) { @@ -270,7 +268,7 @@ tpm_attach(device_t dev) /* In case PnP probe this may contain some initialization. */ tpm_tis12_probe(sc->sc_bt, sc->sc_bh); - + if (tpm_legacy_probe(sc->sc_bt, sc->sc_bh)) { sc->sc_init = tpm_legacy_init; sc->sc_start = tpm_legacy_start; @@ -331,7 +329,6 @@ tpm_detach(device_t dev) return 0; } - #else /* * OpenBSD specific code for probing and attaching TPM to device tree. diff --git a/sys/dev/tpm/tpm20.c b/sys/dev/tpm/tpm20.c index 5b025d9fb842..eeddad85009d 100644 --- a/sys/dev/tpm/tpm20.c +++ b/sys/dev/tpm/tpm20.c @@ -177,7 +177,6 @@ tpm20_close(struct cdev *dev, int flag, int mode, struct thread *td) return (0); } - int tpm20_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td) @@ -234,7 +233,6 @@ tpm20_release(struct tpm_sc *sc) destroy_dev(sc->sc_cdev); } - int tpm20_suspend(device_t dev) { @@ -267,7 +265,6 @@ tpm20_harvest(void *arg) 0x00, TPM_HARVEST_SIZE /* number of bytes requested */ }; - sc = arg; sx_xlock(&sc->dev_lock); while (sc->pending_data_length != 0) diff --git a/sys/dev/tpm/tpm20.h b/sys/dev/tpm/tpm20.h index b56a17102b2d..bafbd93dc136 100644 --- a/sys/dev/tpm/tpm20.h +++ b/sys/dev/tpm/tpm20.h @@ -95,7 +95,6 @@ __FBSDID("$FreeBSD$"); #define TPM_CDEV_NAME "tpm0" #define TPM_CDEV_PERM_FLAG 0600 - #define TPM2_START_METHOD_ACPI 2 #define TPM2_START_METHOD_TIS 6 #define TPM2_START_METHOD_CRB 7 diff --git a/sys/dev/tpm/tpm_acpi.c b/sys/dev/tpm/tpm_acpi.c index 496d0e8173e3..12167e90c4a0 100644 --- a/sys/dev/tpm/tpm_acpi.c +++ b/sys/dev/tpm/tpm_acpi.c @@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$"); #include <contrib/dev/acpica/include/accommon.h> #include <dev/acpica/acpivar.h> - - char *tpm_ids[] = {"ATM1200", "BCM0102", "INTC0102", "SNO3504", "WEC1000", "PNP0C31", NULL}; @@ -53,7 +51,7 @@ static int tpm_acpi_probe(device_t dev) { int rv; - + rv = ACPI_ID_PROBE(device_get_parent(dev), dev, tpm_ids, NULL); if (rv <= 0) device_set_desc(dev, "Trusted Platform Module"); diff --git a/sys/dev/tpm/tpm_crb.c b/sys/dev/tpm/tpm_crb.c index 20857a875073..5345be261d16 100644 --- a/sys/dev/tpm/tpm_crb.c +++ b/sys/dev/tpm/tpm_crb.c @@ -85,7 +85,6 @@ struct tpmcrb_sc { size_t rsp_buf_size; }; - int tpmcrb_transmit(struct tpm_sc *sc, size_t size); static int tpmcrb_acpi_probe(device_t dev); diff --git a/sys/dev/tpm/tpm_tis.c b/sys/dev/tpm/tpm_tis.c index d61339818446..132d238d42bd 100644 --- a/sys/dev/tpm/tpm_tis.c +++ b/sys/dev/tpm/tpm_tis.c @@ -331,7 +331,6 @@ tpmtis_write_bytes(struct tpm_sc *sc, size_t count, uint8_t *buf) return (true); } - static bool tpmtis_request_locality(struct tpm_sc *sc, int locality) { |