aboutsummaryrefslogtreecommitdiff
path: root/sys/powerpc/mpc85xx
diff options
context:
space:
mode:
authorMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:20:08 +0000
committerMateusz Guzik <mjg@FreeBSD.org>2020-09-01 21:20:08 +0000
commitb64b31338f702c25d4542248b1a2ee2420d4dae8 (patch)
tree7ee1de163745cff412128d2cadc137126d820606 /sys/powerpc/mpc85xx
parented83a56181ae1994e038e75b086e4a193e8419e5 (diff)
downloadsrc-b64b31338f702c25d4542248b1a2ee2420d4dae8.tar.gz
src-b64b31338f702c25d4542248b1a2ee2420d4dae8.zip
powerpc: clean up empty lines in .c and .h files
Notes
Notes: svn path=/head/; revision=365073
Diffstat (limited to 'sys/powerpc/mpc85xx')
-rw-r--r--sys/powerpc/mpc85xx/atpic.c1
-rw-r--r--sys/powerpc/mpc85xx/ds1553_bus_fdt.c1
-rw-r--r--sys/powerpc/mpc85xx/ds1553_reg.h1
-rw-r--r--sys/powerpc/mpc85xx/fsl_diu.c2
-rw-r--r--sys/powerpc/mpc85xx/fsl_sata.c1
-rw-r--r--sys/powerpc/mpc85xx/fsl_sata.h1
-rw-r--r--sys/powerpc/mpc85xx/i2c.c3
-rw-r--r--sys/powerpc/mpc85xx/lbc.c4
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx.c1
-rw-r--r--sys/powerpc/mpc85xx/mpc85xx_gpio.c2
-rw-r--r--sys/powerpc/mpc85xx/pci_mpc85xx.c2
-rw-r--r--sys/powerpc/mpc85xx/platform_mpc85xx.c6
-rw-r--r--sys/powerpc/mpc85xx/qoriq_gpio.c3
13 files changed, 6 insertions, 22 deletions
diff --git a/sys/powerpc/mpc85xx/atpic.c b/sys/powerpc/mpc85xx/atpic.c
index 6675d73f0c89..793311b0de55 100644
--- a/sys/powerpc/mpc85xx/atpic.c
+++ b/sys/powerpc/mpc85xx/atpic.c
@@ -242,7 +242,6 @@ atpic_isa_attach(device_t dev)
return (error);
}
-
/*
* PIC interface.
*/
diff --git a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
index 18c3e7a70ee4..021bd529fe74 100644
--- a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
+++ b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c
@@ -64,7 +64,6 @@ static device_method_t rtc_methods[] = {
/* clock interface */
DEVMETHOD(clock_gettime, ds1553_gettime),
DEVMETHOD(clock_settime, ds1553_settime),
-
{ 0, 0 }
};
diff --git a/sys/powerpc/mpc85xx/ds1553_reg.h b/sys/powerpc/mpc85xx/ds1553_reg.h
index 125212f5e818..f81bc0e6ddd6 100644
--- a/sys/powerpc/mpc85xx/ds1553_reg.h
+++ b/sys/powerpc/mpc85xx/ds1553_reg.h
@@ -85,7 +85,6 @@
#define DS1553_MASK_SECONDS 0x7f
struct ds1553_softc {
-
bus_space_tag_t sc_bst; /* bus space tag */
bus_space_handle_t sc_bsh; /* bus space handle */
diff --git a/sys/powerpc/mpc85xx/fsl_diu.c b/sys/powerpc/mpc85xx/fsl_diu.c
index a31497ab8734..b116809011dc 100644
--- a/sys/powerpc/mpc85xx/fsl_diu.c
+++ b/sys/powerpc/mpc85xx/fsl_diu.c
@@ -413,7 +413,7 @@ diu_attach(device_t dev)
sc->sc_info.fb_pbase = (intptr_t)vtophys(sc->sc_info.fb_vbase);
sc->sc_info.fb_flags = FB_FLAG_MEMATTR;
sc->sc_info.fb_memattr = VM_MEMATTR_DEFAULT;
-
+
/* Gamma table is 3 consecutive segments of 256 bytes. */
sc->sc_gamma = contigmalloc(3 * 256, M_DEVBUF, 0, 0,
BUS_SPACE_MAXADDR_32BIT, PAGE_SIZE, 0);
diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c
index 02d828d45432..64fe1cafa38a 100644
--- a/sys/powerpc/mpc85xx/fsl_sata.c
+++ b/sys/powerpc/mpc85xx/fsl_sata.c
@@ -58,7 +58,6 @@ struct fsl_sata_slot;
enum fsl_sata_err_type;
struct fsl_sata_cmd_tab;
-
/* local prototypes */
static int fsl_sata_init(device_t dev);
static int fsl_sata_deinit(device_t dev);
diff --git a/sys/powerpc/mpc85xx/fsl_sata.h b/sys/powerpc/mpc85xx/fsl_sata.h
index 3a9ea20484b0..ba9efac8ba77 100644
--- a/sys/powerpc/mpc85xx/fsl_sata.h
+++ b/sys/powerpc/mpc85xx/fsl_sata.h
@@ -138,4 +138,3 @@
#define ATA_SC_IPM_DIS_PARTIAL 0x00000100
#define ATA_SC_IPM_DIS_SLUMBER 0x00000200
#define ATA_SC_IPM_DIS_DEVSLEEP 0x00000400
-
diff --git a/sys/powerpc/mpc85xx/i2c.c b/sys/powerpc/mpc85xx/i2c.c
index e3d48b36fa8a..390e492b2d0b 100644
--- a/sys/powerpc/mpc85xx/i2c.c
+++ b/sys/powerpc/mpc85xx/i2c.c
@@ -114,7 +114,6 @@ static device_method_t i2c_methods[] = {
DEVMETHOD(iicbus_write, i2c_write),
DEVMETHOD(iicbus_transfer, iicbus_transfer_gen),
DEVMETHOD(ofw_bus_get_node, i2c_get_node),
-
{ 0, 0 }
};
@@ -252,7 +251,7 @@ i2c_repeated_start(device_t dev, u_char slave, int timeout)
{
struct i2c_softc *sc;
int error;
-
+
sc = device_get_softc(dev);
mtx_lock(&sc->mutex);
diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c
index afe68b86baf9..f79161c25282 100644
--- a/sys/powerpc/mpc85xx/lbc.c
+++ b/sys/powerpc/mpc85xx/lbc.c
@@ -110,7 +110,6 @@ static device_method_t lbc_methods[] = {
DEVMETHOD(ofw_bus_get_name, ofw_bus_gen_get_name),
DEVMETHOD(ofw_bus_get_node, ofw_bus_gen_get_node),
DEVMETHOD(ofw_bus_get_type, ofw_bus_gen_get_type),
-
{ 0, 0 }
};
@@ -384,7 +383,6 @@ fdt_lbc_reg_decode(phandle_t node, struct lbc_softc *sc,
regptr = reg;
for (i = 0; i < tuples; i++) {
-
bank = fdt_data_get((void *)reg, 1);
di->di_bank = bank;
reg += 1;
@@ -562,7 +560,6 @@ lbc_attach(device_t dev)
start = 0;
size = 0;
for (i = 0; i < tuples; i++) {
-
/* The first cell is the bank (chip select) number. */
bank = fdt_data_get(ranges, 1);
if (bank < 0 || bank > LBC_DEV_MAX) {
@@ -623,7 +620,6 @@ lbc_attach(device_t dev)
* Walk the localbus and add direct subordinates as our children.
*/
for (child = OF_child(node); child != 0; child = OF_peer(child)) {
-
di = malloc(sizeof(*di), M_LBC, M_WAITOK | M_ZERO);
if (ofw_bus_gen_setup_devinfo(&di->di_ofw, child) != 0) {
diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c
index 221f8bff011e..062407713730 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.c
+++ b/sys/powerpc/mpc85xx/mpc85xx.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <powerpc/mpc85xx/mpc85xx.h>
-
/*
* MPC85xx system specific routines
*/
diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c
index 062694d77674..729a00b8e45d 100644
--- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c
+++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c
@@ -170,7 +170,7 @@ mpc85xx_gpio_pin_toggle(device_t dev, uint32_t pin)
val = bus_read_4(sc->out_res, 0);
val ^= (1 << (31 - pin));
bus_write_4(sc->out_res, 0, val);
-
+
GPIO_UNLOCK(sc);
return (0);
diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c
index df1473a26c66..b7035e372105 100644
--- a/sys/powerpc/mpc85xx/pci_mpc85xx.c
+++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c
@@ -625,7 +625,6 @@ fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, uint64_t start,
bus_space_write_4(sc->sc_bst, sc->sc_bsh, REG_POWAR(wnd), attr);
}
-
static void
fsl_pcib_err_init(device_t dev)
{
@@ -827,7 +826,6 @@ static int fsl_pcib_map_msi(device_t dev, device_t child,
return (0);
}
-
/*
* Linux device trees put the msi@<x> as children of the SoC, with ranges based
* on the CCSR. Since rman doesn't permit overlapping or sub-ranges between
diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c
index a19a177f2097..bbb1870c6648 100644
--- a/sys/powerpc/mpc85xx/platform_mpc85xx.c
+++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c
@@ -569,7 +569,6 @@ dummy_freeze(device_t dev, bool freeze)
/* Nothing to do here, move along. */
}
-
/* QorIQ Run control/power management timebase management. */
#define RCPM_CTBENR 0x00000084
@@ -583,7 +582,7 @@ mpc85xx_rcpm_freeze_timebase(device_t dev, bool freeze)
struct mpc85xx_rcpm_softc *sc;
sc = device_get_softc(dev);
-
+
if (freeze)
bus_write_4(sc->sc_mem, RCPM_CTBENR, 0);
else
@@ -634,7 +633,6 @@ static driver_t mpc85xx_rcpm_driver = {
EARLY_DRIVER_MODULE(mpc85xx_rcpm, simplebus, mpc85xx_rcpm_driver,
mpc85xx_rcpm_devclass, 0, 0, BUS_PASS_BUS);
-
/* "Global utilities" power management/Timebase management. */
#define GUTS_DEVDISR 0x00000070
@@ -652,7 +650,7 @@ mpc85xx_guts_freeze_timebase(device_t dev, bool freeze)
uint32_t devdisr;
sc = device_get_softc(dev);
-
+
devdisr = bus_read_4(sc->sc_mem, GUTS_DEVDISR);
if (freeze)
bus_write_4(sc->sc_mem, GUTS_DEVDISR,
diff --git a/sys/powerpc/mpc85xx/qoriq_gpio.c b/sys/powerpc/mpc85xx/qoriq_gpio.c
index 189945dde73f..7abae276e8d1 100644
--- a/sys/powerpc/mpc85xx/qoriq_gpio.c
+++ b/sys/powerpc/mpc85xx/qoriq_gpio.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
#define GPIO_GPIMR 0x10
#define GPIO_GPICR 0x14
-
struct qoriq_gpio_softc {
device_t dev;
device_t busdev;
@@ -209,7 +208,7 @@ qoriq_gpio_pin_toggle(device_t dev, uint32_t pin)
val = bus_read_4(sc->sc_mem, GPIO_GPDAT);
val ^= (1 << (31 - pin));
bus_write_4(sc->sc_mem, GPIO_GPDAT, val);
-
+
GPIO_UNLOCK(sc);
return (0);