From 2eeb1f56e3ba117bc4a692d9e0ae8be857d54bc3 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 30 May 2020 20:12:23 +0200 Subject: [PATCH] kernel/pci: Remove embedded newlines in sysctl descriptions. --- sys/bus/pci/pci.c | 21 +++++++++++---------- sys/dev/pccard/pccbb/pccbb_isa.c | 10 +++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index 23f4746785..b9ce2d5944 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -285,18 +285,18 @@ static int pci_enable_io_modes = 1; TUNABLE_INT("hw.pci.enable_io_modes", &pci_enable_io_modes); SYSCTL_INT(_hw_pci, OID_AUTO, enable_io_modes, CTLFLAG_RW, &pci_enable_io_modes, 1, - "Enable I/O and memory bits in the config register. Some BIOSes do not\n\ -enable these bits correctly. We'd like to do this all the time, but there\n\ -are some peripherals that this causes problems with."); + "Enable I/O and memory bits in the config register. Some BIOSes do not" + " enable these bits correctly. We'd like to do this all the time, but" + " there are some peripherals that this causes problems with."); static int pci_do_power_nodriver = 0; TUNABLE_INT("hw.pci.do_power_nodriver", &pci_do_power_nodriver); SYSCTL_INT(_hw_pci, OID_AUTO, do_power_nodriver, CTLFLAG_RW, &pci_do_power_nodriver, 0, - "Place a function into D3 state when no driver attaches to it. 0 means\n\ -disable. 1 means conservatively place devices into D3 state. 2 means\n\ -aggressively place devices into D3 state. 3 means put absolutely everything\n\ -in D3 state."); + "Place a function into D3 state when no driver attaches to it. 0 means" + " disable. 1 means conservatively place devices into D3 state. 2 means" + " aggressively place devices into D3 state. 3 means put absolutely" + " everything in D3 state."); static int pci_do_power_resume = 1; TUNABLE_INT("hw.pci.do_power_resume", &pci_do_power_resume); @@ -323,9 +323,10 @@ SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD, static int pci_usb_takeover = 1; TUNABLE_INT("hw.pci.usb_early_takeover", &pci_usb_takeover); SYSCTL_INT(_hw_pci, OID_AUTO, usb_early_takeover, CTLFLAG_RD, - &pci_usb_takeover, 1, "Enable early takeover of USB controllers.\n\ -Disable this if you depend on BIOS emulation of USB devices, that is\n\ -you use USB devices (like keyboard or mouse) but do not load USB drivers"); + &pci_usb_takeover, 1, + "Enable early takeover of USB controllers. Disable this if you depend on" + " BIOS emulation of USB devices, that is you use USB devices (like" + " keyboard or mouse) but do not load USB drivers"); #endif static int pci_msi_cpuid; diff --git a/sys/dev/pccard/pccbb/pccbb_isa.c b/sys/dev/pccard/pccbb/pccbb_isa.c index abbee4e441..211ef686f6 100644 --- a/sys/dev/pccard/pccbb/pccbb_isa.c +++ b/sys/dev/pccard/pccbb/pccbb_isa.c @@ -68,11 +68,11 @@ SYSCTL_NODE(_hw, OID_AUTO, pcic, CTLFLAG_RD, 0, "PCIC parameters"); static int isa_intr_mask = EXCA_INT_MASK_ALLOWED; TUNABLE_INT("hw.cbb.intr_mask", &isa_intr_mask); SYSCTL_INT(_hw_pcic, OID_AUTO, intr_mask, CTLFLAG_RD, &isa_intr_mask, 0, - "Mask of allowable interrupts for this laptop. The default is generally\n\ -correct, but some laptops do not route all the IRQ pins to the bridge to\n\ -save wires. Sometimes you need a more restrictive mask because some of the\n\ -hardware in your laptop may not have a driver so its IRQ might not be\n\ -allocated."); + "Mask of allowable interrupts for this laptop. The default is generally" + " correct, but some laptops do not route all the IRQ pins to the bridge to" + " save wires. Sometimes you need a more restrictive mask because some of" + " the hardware in your laptop may not have a driver so its IRQ might not be" + " allocated."); /***************************************************************************** * End of configurable parameters. -- 2.41.0