diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:01:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:02:38 +0200 |
| commit | 764941b17e53e40dd1df1ac3137ebc825d5d6480 (patch) | |
| tree | 845a9c567691ddfac0c46493f2f50fe61e1e728e /drivers | |
| parent | bc4ac257257c340b108499e65ed7ac383306b2b8 (diff) | |
| parent | 8a7822a8d6659a1132f668dcc20328a1e646f00e (diff) | |
| download | barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.gz barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.xz | |
Merge branch 'for-next/magicvar-unique-id' into for-next/reboot-mode
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/peb.c | 20 | ||||
| -rw-r--r-- | drivers/pci/pci-layerscape.c | 5 | ||||
| -rw-r--r-- | drivers/power/reset/reboot-mode.c | 10 |
3 files changed, 14 insertions, 21 deletions
diff --git a/drivers/mtd/peb.c b/drivers/mtd/peb.c index d10a8a024d..b47d04b4c0 100644 --- a/drivers/mtd/peb.c +++ b/drivers/mtd/peb.c @@ -88,18 +88,14 @@ static int mtd_peb_debug_init(void) } device_initcall(mtd_peb_debug_init); -BAREBOX_MAGICVAR_NAMED(global_mtd_peb_emulate_bitflip, - global.mtd_peb.emulate_bitflip, - "random bitflips, on average every #nth access returns -EUCLEAN"); -BAREBOX_MAGICVAR_NAMED(global_mtd_peb_emulate_write_failure, - global.mtd_peb.emulate_write_failure, - "random write failures, on average every #nth access returns write failure"); -BAREBOX_MAGICVAR_NAMED(global_mtd_peb_emulate_erase_failures, - global.mtd_peb.emulate_erase_failures, - "random erase failures, on average every #nth access returns erase failure"); -BAREBOX_MAGICVAR_NAMED(global_mtd_peb_chk_io, - global.mtd_peb.chk_io, - "If true, written data will be verified"); +BAREBOX_MAGICVAR(global.mtd_peb.emulate_bitflip, + "random bitflips, on average every #nth access returns -EUCLEAN"); +BAREBOX_MAGICVAR(global.mtd_peb.emulate_write_failure, + "random write failures, on average every #nth access returns write failure"); +BAREBOX_MAGICVAR(global.mtd_peb.emulate_erase_failures, + "random erase failures, on average every #nth access returns erase failure"); +BAREBOX_MAGICVAR(global.mtd_peb.chk_io, + "If true, written data will be verified"); #endif diff --git a/drivers/pci/pci-layerscape.c b/drivers/pci/pci-layerscape.c index 53be43b28f..d8f03fa599 100644 --- a/drivers/pci/pci-layerscape.c +++ b/drivers/pci/pci-layerscape.c @@ -363,9 +363,8 @@ static phandle ls_pcie_get_iommu_handle(struct device_node *np, phandle *handle) */ static int ls_pcie_share_stream_id; -BAREBOX_MAGICVAR_NAMED(global_ls_pcie_share_stream_id, - global.layerscape_pcie.share_stream_ids, - "If true, use a stream_id per host controller and not per device"); +BAREBOX_MAGICVAR(global.layerscape_pcie.share_stream_ids, + "If true, use a stream_id per host controller and not per device"); static int ls_pcie_of_fixup(struct device_node *root, void *ctx) { diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c index 313ba6dc3a..df3be03edf 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -225,9 +225,7 @@ const char *reboot_mode_get(void) } EXPORT_SYMBOL_GPL(reboot_mode_get); -BAREBOX_MAGICVAR_NAMED(global_system_reboot_mode_prev, - global.system.reboot_mode.prev, - "reboot-mode: Mode set previously, before barebox start"); -BAREBOX_MAGICVAR_NAMED(global_system_reboot_mode_next, - global.system.reboot_mode.next, - "reboot-mode: Mode to set next, to be evaluated after reset"); +BAREBOX_MAGICVAR(global.system.reboot_mode.prev, + "reboot-mode: Mode set previously, before barebox start"); +BAREBOX_MAGICVAR(global.system.reboot_mode.next, + "reboot-mode: Mode to set next, to be evaluated after reset"); |