From 2a435072561180d42ee3d45091a570c8624934d5 Mon Sep 17 00:00:00 2001
From: Ian Leonard <antonlacon@gmail.com>
Date: Tue, 19 Jan 2021 19:33:56 +0000
Subject: [PATCH] linux-drivers: automated code cleanup

Signed-off-by: Ian Leonard <antonlacon@gmail.com>
---
 packages/linux-drivers/RTL8188EU/package.mk    | 10 +++++-----
 packages/linux-drivers/RTL8192CU/package.mk    | 10 +++++-----
 packages/linux-drivers/RTL8192DU/package.mk    | 10 +++++-----
 packages/linux-drivers/RTL8192EU/package.mk    | 10 +++++-----
 packages/linux-drivers/RTL8812AU/package.mk    | 10 +++++-----
 packages/linux-drivers/bcm_sta/package.mk      |  8 ++++----
 packages/linux-drivers/mali-bifrost/package.mk | 14 +++++++-------
 packages/linux-drivers/mali-midgard/package.mk | 10 +++++-----
 packages/linux-drivers/mali-utgard/package.mk  |  8 ++++----
 9 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/packages/linux-drivers/RTL8188EU/package.mk b/packages/linux-drivers/RTL8188EU/package.mk
index 3fc9dd7459..bfe80b5b24 100644
--- a/packages/linux-drivers/RTL8188EU/package.mk
+++ b/packages/linux-drivers/RTL8188EU/package.mk
@@ -8,7 +8,7 @@ PKG_SHA256="e855e210b27fc33212c558d34c32e0a5ccc32209d5c7e3f71fcf67695c224594"
 PKG_LICENSE="GPL"
 # realtek: PKG_SITE="http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PFid=48&Level=5&Conn=4&ProdID=274&DownTypeID=3&GetDown=false&Downloads=true"
 PKG_SITE="https://github.com/lwfinger/rtl8188eu"
-PKG_URL="https://github.com/lwfinger/rtl8188eu/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lwfinger/rtl8188eu/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Realtek RTL81xxEU Linux 3.x driver"
 PKG_IS_KERNEL_PKG="yes"
 
@@ -18,13 +18,13 @@ pre_make_target() {
 
 make_target() {
   make modules \
-       ARCH=$TARGET_KERNEL_ARCH \
+       ARCH=${TARGET_KERNEL_ARCH} \
        KSRC=$(kernel_path) \
-       CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
+       CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \
        CONFIG_POWER_SAVING=n
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
diff --git a/packages/linux-drivers/RTL8192CU/package.mk b/packages/linux-drivers/RTL8192CU/package.mk
index 2e10134a72..8d4270566c 100644
--- a/packages/linux-drivers/RTL8192CU/package.mk
+++ b/packages/linux-drivers/RTL8192CU/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="7a15cb42e568b0f9c3c872bd6a06cdcab9f0ffd0"
 PKG_SHA256="93cd979956ab3f60618707cd11395549ecff17135fa969e25f031a1f06453a7d"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/pvaret/rtl8192cu-fixes"
-PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
+PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Realtek RTL81xxCU Linux 3.x driver"
 PKG_IS_KERNEL_PKG="yes"
 
@@ -17,13 +17,13 @@ pre_make_target() {
 
 make_target() {
   make V=1 \
-       ARCH=$TARGET_KERNEL_ARCH \
+       ARCH=${TARGET_KERNEL_ARCH} \
        KSRC=$(kernel_path) \
-       CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
+       CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \
        CONFIG_POWER_SAVING=n
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk
index 8c82a97818..021257b39a 100644
--- a/packages/linux-drivers/RTL8192DU/package.mk
+++ b/packages/linux-drivers/RTL8192DU/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="331ec03d89d0c0ebe771c4011846f029f6af33d3"
 PKG_SHA256="74e173b96d366ad50a0634fe98a8e55dc865276cd07de8fd635eaa4d5f71dae4"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lwfinger/rtl8192du"
-PKG_URL="https://github.com/lwfinger/rtl8192du/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lwfinger/rtl8192du/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Realtek RTL8192DU Linux 3.x driver"
 PKG_IS_KERNEL_PKG="yes"
 
@@ -17,13 +17,13 @@ pre_make_target() {
 
 make_target() {
   make V=1 \
-       ARCH=$TARGET_KERNEL_ARCH \
+       ARCH=${TARGET_KERNEL_ARCH} \
        KSRC=$(kernel_path) \
-       CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
+       CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \
        CONFIG_POWER_SAVING=n
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk
index 6a5c078eb6..017af054ae 100644
--- a/packages/linux-drivers/RTL8192EU/package.mk
+++ b/packages/linux-drivers/RTL8192EU/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="faf68bbf82623335e7997a473f9222751e275927"
 PKG_SHA256="f6988f1f0a4128cf935c2d09cd45a782f46414dc1a8d7c992c05ed7d565ac922"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver"
-PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Realtek RTL8192EU Linux 3.x driver"
 PKG_IS_KERNEL_PKG="yes"
 
@@ -17,14 +17,14 @@ pre_make_target() {
 
 make_target() {
   make V=1 \
-       ARCH=$TARGET_KERNEL_ARCH \
+       ARCH=${TARGET_KERNEL_ARCH} \
        KSRC=$(kernel_path) \
-       CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
+       CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \
        CONFIG_POWER_SAVING=n \
        USER_EXTRA_CFLAGS="-Wno-error=date-time"
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk
index c016c92028..81ae08ddd3 100644
--- a/packages/linux-drivers/RTL8812AU/package.mk
+++ b/packages/linux-drivers/RTL8812AU/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION="64e7aaa5657ef63ab7ce74ce5554b49a21552e68"
 PKG_SHA256="1b7a79b15348f1a1125a351e5e5ff524456236519e20ee04b59484aefa6afbaa"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/aircrack-ng/rtl8812au"
-PKG_URL="https://github.com/aircrack-ng/rtl8812au/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/aircrack-ng/rtl8812au/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="Realtek RTL8812AU Linux 3.x driver"
 PKG_IS_KERNEL_PKG="yes"
 
@@ -17,13 +17,13 @@ pre_make_target() {
 
 make_target() {
   make V=1 \
-       ARCH=$TARGET_KERNEL_ARCH \
+       ARCH=${TARGET_KERNEL_ARCH} \
        KSRC=$(kernel_path) \
-       CROSS_COMPILE=$TARGET_KERNEL_PREFIX \
+       CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \
        CONFIG_POWER_SAVING=n
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
-    cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
diff --git a/packages/linux-drivers/bcm_sta/package.mk b/packages/linux-drivers/bcm_sta/package.mk
index fbe7fa5889..9a53ac79cc 100644
--- a/packages/linux-drivers/bcm_sta/package.mk
+++ b/packages/linux-drivers/bcm_sta/package.mk
@@ -11,17 +11,17 @@ PKG_SHA256="959bcd1e965d294304a4e290cb8e47b7c74b9763094eff4d0b8e6cfb68a6895b"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com/"
-PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_LONGDESC="Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver."
 PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
 make_target() {
   cd x86-64
-    KBUILD_NOPEDANTIC=1 kernel_make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$TARGET_KERNEL_ARCH
+    KBUILD_NOPEDANTIC=1 kernel_make V=1 CC=${CC} -C $(kernel_path) M=$(pwd) BINARCH=${TARGET_KERNEL_ARCH}
 }
 
 makeinstall_target() {
-  mkdir -p $INSTALL/$(get_full_module_dir)/bcm_sta
-    cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/bcm_sta
+    cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
 }
diff --git a/packages/linux-drivers/mali-bifrost/package.mk b/packages/linux-drivers/mali-bifrost/package.mk
index a5fe88607b..7363f38da9 100644
--- a/packages/linux-drivers/mali-bifrost/package.mk
+++ b/packages/linux-drivers/mali-bifrost/package.mk
@@ -7,25 +7,25 @@ PKG_SHA256="712ba83f28bf687e2147f0f586678421b0d2cb5620423e93e7b7c9ddf35c1da5"
 PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://developer.arm.com/products/software/mali-drivers/bifrost-kernel"
-PKG_URL="https://github.com/LibreELEC/mali-bifrost/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/LibreELEC/mali-bifrost/archive/${PKG_VERSION}.tar.gz"
 PKG_LONGDESC="mali-bifrost: the Linux kernel driver for ARM Mali Bifrost GPUs"
 PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
-case $PROJECT in
+case ${PROJECT} in
   Amlogic)
     PKG_MALI_PLATFORM_CONFIG="config.meson-g12a"
     ;;
 esac
 
 make_target() {
-  kernel_make KDIR=$(kernel_path) -C $PKG_BUILD \
-       CONFIG_NAME=$PKG_MALI_PLATFORM_CONFIG
+  kernel_make KDIR=$(kernel_path) -C ${PKG_BUILD} \
+       CONFIG_NAME=${PKG_MALI_PLATFORM_CONFIG}
 }
 
 makeinstall_target() {
-  DRIVER_DIR=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard/
+  DRIVER_DIR=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard/
 
-  mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME
-    cp $DRIVER_DIR/mali_kbase.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME/
+  mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}
+    cp ${DRIVER_DIR}/mali_kbase.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}/
 }
diff --git a/packages/linux-drivers/mali-midgard/package.mk b/packages/linux-drivers/mali-midgard/package.mk
index d312e84038..2c6b1c26e1 100644
--- a/packages/linux-drivers/mali-midgard/package.mk
+++ b/packages/linux-drivers/mali-midgard/package.mk
@@ -12,7 +12,7 @@ PKG_LONGDESC="mali-midgard: Linux drivers for Mali Midgard GPUs"
 PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
-case $PROJECT in
+case ${PROJECT} in
   Allwinner)
     PKG_CONFIGS="CONFIG_MALI_PLATFORM_NAME=sunxi"
     ;;
@@ -26,17 +26,17 @@ esac
 
 post_patch() {
   # rename kernel module to not clash with mali-bifrost
-  find $PKG_BUILD -name Kbuild -exec sed -i 's/mali_kbase.o/mali_midgard.o/g; s/mali_kbase-/mali_midgard-/g' {} \;
+  find ${PKG_BUILD} -name Kbuild -exec sed -i 's/mali_kbase.o/mali_midgard.o/g; s/mali_kbase-/mali_midgard-/g' {} \;
 }
 
 make_target() {
-  kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard \
+  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard \
     EXTRA_CFLAGS="${PKG_EXTRA_CFLAGS}" \
     CONFIG_MALI_MIDGARD=m ${PKG_CONFIGS}
 }
 
 makeinstall_target() {
-  kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard \
-    INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \
+  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard \
+    INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \
     modules_install
 }
diff --git a/packages/linux-drivers/mali-utgard/package.mk b/packages/linux-drivers/mali-utgard/package.mk
index d96b6e9562..9faf050bc7 100644
--- a/packages/linux-drivers/mali-utgard/package.mk
+++ b/packages/linux-drivers/mali-utgard/package.mk
@@ -12,7 +12,7 @@ PKG_LONGDESC="mali-utgard: Linux drivers for Mali Utgard GPUs"
 PKG_TOOLCHAIN="manual"
 PKG_IS_KERNEL_PKG="yes"
 
-case $PROJECT in
+case ${PROJECT} in
   Allwinner)
     PKG_MALI_PLATFORM="sunxi"
     ;;
@@ -27,14 +27,14 @@ case $PROJECT in
 esac
 
 make_target() {
-  kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/src/devicedrv/mali \
+  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/src/devicedrv/mali \
     MALI_PLATFORM_FILES=platform/${PKG_MALI_PLATFORM}/${PKG_MALI_PLATFORM}.c GIT_REV="" \
     EXTRA_CFLAGS="-DMALI_FAKE_PLATFORM_DEVICE=1 -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH -DCONFIG_MALI400=1 -DCONFIG_MALI450=1 -DCONFIG_MALI470=1 ${PKG_EXTRA_CFLAGS}" \
     CONFIG_MALI400=m CONFIG_MALI450=y CONFIG_MALI470=y CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y ${PKG_CONFIGS}
 }
 
 makeinstall_target() {
-  kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/src/devicedrv/mali/ \
-    INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \
+  kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/src/devicedrv/mali/ \
+    INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \
     modules_install
 }