[PATCH] staging: most: Fix build errors
This patch fixes build errors that occur when trying to build the MOST modules. For example, the cdev module build fails with: make[3]: *** No rule to make target 'drivers/staging/most/aim-cdev/cdev.o', needed by 'drivers/staging/most/aim-cdev/aim_cdev.o'. Stop. scripts/Makefile.build:569: recipe for target 'drivers/staging/most/aim-cdev' failed make[2]: *** [drivers/staging/most/aim-cdev] Error 2 scripts/Makefile.build:569: recipe for target 'drivers/staging/most' failed make[1]: *** [drivers/staging/most] Error 2 Makefile:1502: recipe for target '_module_drivers/staging' failed make: *** [_module_drivers/staging] Error 2 Update the Makefile variables and paths with the new directory structure to fix these errors. Signed-off-by: Chris Coffey --- drivers/staging/most/Makefile | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/most/Makefile b/drivers/staging/most/Makefile index 7f6aa9c515..f8bcf488ec 100644 --- a/drivers/staging/most/Makefile +++ b/drivers/staging/most/Makefile @@ -3,10 +3,10 @@ obj-$(CONFIG_MOST) += most_core.o most_core-y := core.o ccflags-y += -Idrivers/staging/ -obj-$(CONFIG_AIM_CDEV) += aim-cdev/ -obj-$(CONFIG_AIM_NETWORK) += aim-network/ -obj-$(CONFIG_AIM_SOUND)+= aim-sound/ -obj-$(CONFIG_AIM_V4L2) += aim-v4l2/ -obj-$(CONFIG_HDM_DIM2) += hdm-dim2/ -obj-$(CONFIG_HDM_I2C) += hdm-i2c/ -obj-$(CONFIG_HDM_USB) += hdm-usb/ +obj-$(CONFIG_MOST_CDEV)+= cdev/ +obj-$(CONFIG_MOST_NET) += net/ +obj-$(CONFIG_MOST_SOUND) += sound/ +obj-$(CONFIG_MOST_VIDEO) += video/ +obj-$(CONFIG_MOST_DIM2)+= dim2/ +obj-$(CONFIG_MOST_I2C) += i2c/ +obj-$(CONFIG_MOST_USB) += usb/ -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: most: Fix build errors
On Tue, Nov 28, 2017 at 08:26:07AM +0100, Greg Kroah-Hartman wrote: > On Mon, Nov 27, 2017 at 09:12:39PM +0000, Chris Coffey wrote: > > This patch fixes build errors that occur when trying to build the > > MOST modules. For example, the cdev module build fails with: > > > > make[3]: *** No rule to make target 'drivers/staging/most/aim-cdev/cdev.o', > > needed by 'drivers/staging/most/aim-cdev/aim_cdev.o'. Stop. > > scripts/Makefile.build:569: recipe for target > > 'drivers/staging/most/aim-cdev' failed > > make[2]: *** [drivers/staging/most/aim-cdev] Error 2 > > scripts/Makefile.build:569: recipe for target 'drivers/staging/most' failed > > make[1]: *** [drivers/staging/most] Error 2 > > Makefile:1502: recipe for target '_module_drivers/staging' failed > > make: *** [_module_drivers/staging] Error 2 > > How are you seeing this error? What is the build command line that you > provided to do this? It should just "not build" right now at all. > I did a git pull to get the latest staging updates, enabled a bunch of staging drivers, and then ran a build on the staging modules with 'make modules M=drivers/staging'. Unfortunately now I'm unable to reproduce the error (of course). > > Update the Makefile variables and paths with the new directory > > structure to fix these errors. > > > > Signed-off-by: Chris Coffey > > --- > > drivers/staging/most/Makefile | 14 +++--- > > 1 file changed, 7 insertions(+), 7 deletions(-) > > I think a patch was sent yesterday to fix these up, did you see it in > the archives? I checked the archives before making the patch, and didn't see anything MOST-related in there for the past few days. The patch below made the build succeed and generate all of the MOST modules. > > thanks, > > greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8192u: Use __func__ instead of function name in strings
Replace hard-coded function names in strings with '"%s...", __func__' in the r8190_rtl8256.c file. Issue found by checkpatch.pl. Signed-off-by: Chris Coffey --- Patch generated on staging tree, staging-testing branch. drivers/staging/rtl8192u/r8190_rtl8256.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192u/r8190_rtl8256.c b/drivers/staging/rtl8192u/r8190_rtl8256.c index e54f6fad2e..a095c359df 100644 --- a/drivers/staging/rtl8192u/r8190_rtl8256.c +++ b/drivers/staging/rtl8192u/r8190_rtl8256.c @@ -53,7 +53,7 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth) (RF90_RADIO_PATH_E)eRFPath, 0x14, bMask12Bits, 0x5ab); } else { - RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n"); + RT_TRACE(COMP_ERR, "%s: unknown hardware version\n", __func__); } break; case HT_CHANNEL_WIDTH_20_40: @@ -68,11 +68,11 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, HT_CHANNEL_WIDTH Bandwidth) else rtl8192_phy_SetRFReg(dev, (RF90_RADIO_PATH_E)eRFPath, 0x14, bMask12Bits, 0x5ab); } else { - RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown hardware version\n"); + RT_TRACE(COMP_ERR, "%s: unknown hardware version\n", __func__); } break; default: - RT_TRACE(COMP_ERR, "PHY_SetRF8256Bandwidth(): unknown Bandwidth: %#X\n", Bandwidth); + RT_TRACE(COMP_ERR, "%s: unknown Bandwidth: %#X\n", __func__, Bandwidth); break; } @@ -152,7 +152,7 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) * TODO: this function should be removed on ASIC , Emily 2007.2.2 */ if (rtl8192_phy_checkBBAndRF(dev, HW90_BLOCK_RF, (RF90_RADIO_PATH_E)eRFPath)) { - RT_TRACE(COMP_ERR, "PHY_RF8256_Config():Check Radio[%d] Fail!!\n", eRFPath); + RT_TRACE(COMP_ERR, "%s: Check Radio[%d] Fail!!\n", __func__, eRFPath); goto phy_RF8256_Config_ParaFile_Fail; } @@ -207,7 +207,7 @@ void phy_RF8256_Config_ParaFile(struct net_device *dev) } if (ret) { - RT_TRACE(COMP_ERR, "phy_RF8256_Config_ParaFile():Radio[%d] Fail!!", eRFPath); + RT_TRACE(COMP_ERR, "%s: Radio[%d] Fail!!", __func__, eRFPath); goto phy_RF8256_Config_ParaFile_Fail; } -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: goldfish: Use __func__ instead of function name
Replace hard-coded function names in strings with "%s", __func__ in the goldfish_nand.c file. Issue found by checkpatch.pl. Signed-off-by: Chris Coffey --- drivers/staging/goldfish/goldfish_nand.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/goldfish/goldfish_nand.c b/drivers/staging/goldfish/goldfish_nand.c index 8f92ff4ba4..e742b92bb1 100644 --- a/drivers/staging/goldfish/goldfish_nand.c +++ b/drivers/staging/goldfish/goldfish_nand.c @@ -157,8 +157,8 @@ static int goldfish_nand_read_oob(struct mtd_info *mtd, loff_t ofs, return 0; invalid_arg: - pr_err("goldfish_nand_read_oob: invalid read, start %llx, len %zx, ooblen %zx, dev_size %llx, write_size %x\n", - ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize); + pr_err("%s: invalid read, start %llx, len %zx, ooblen %zx, dev_size %llx, write_size %x\n", + __func__, ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize); return -EINVAL; } @@ -189,8 +189,8 @@ static int goldfish_nand_write_oob(struct mtd_info *mtd, loff_t ofs, return 0; invalid_arg: - pr_err("goldfish_nand_write_oob: invalid write, start %llx, len %zx, ooblen %zx, dev_size %llx, write_size %x\n", - ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize); + pr_err("%s: invalid write, start %llx, len %zx, ooblen %zx, dev_size %llx, write_size %x\n", + __func__, ofs, ops->len, ops->ooblen, mtd->size, mtd->writesize); return -EINVAL; } @@ -211,8 +211,8 @@ static int goldfish_nand_read(struct mtd_info *mtd, loff_t from, size_t len, return 0; invalid_arg: - pr_err("goldfish_nand_read: invalid read, start %llx, len %zx, dev_size %llx, write_size %x\n", - from, len, mtd->size, mtd->writesize); + pr_err("%s: invalid read, start %llx, len %zx, dev_size %llx, write_size %x\n", + __func__, from, len, mtd->size, mtd->writesize); return -EINVAL; } @@ -233,8 +233,8 @@ static int goldfish_nand_write(struct mtd_info *mtd, loff_t to, size_t len, return 0; invalid_arg: - pr_err("goldfish_nand_write: invalid write, start %llx, len %zx, dev_size %llx, write_size %x\n", - to, len, mtd->size, mtd->writesize); + pr_err("%s: invalid write, start %llx, len %zx, dev_size %llx, write_size %x\n", + __func__, to, len, mtd->size, mtd->writesize); return -EINVAL; } @@ -340,8 +340,8 @@ static int goldfish_nand_init_device(struct platform_device *pdev, name); if (result != name_len) { dev_err(&pdev->dev, - "goldfish_nand_init_device failed to get dev name %d != %d\n", - result, name_len); + "%s: failed to get dev name %d != %d\n", + __func__, result, name_len); return -ENODEV; } ((char *)mtd->name)[name_len] = '\0'; -- 2.1.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: mt7621-eth: Fix sparse warning in ethtool.c
Include the local ethtool.h header file in mtk_eth_soc.h so implementation files have centralized access to it. This fixes the following sparse warning: drivers/staging/mt7621-eth/ethtool.c:213:6: warning: symbol 'mtk_set_ethtool_ops' was not declared. Should it be static? Signed-off-by: Chris Coffey --- drivers/staging/mt7621-eth/mtk_eth_soc.c | 1 - drivers/staging/mt7621-eth/mtk_eth_soc.h | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.c b/drivers/staging/mt7621-eth/mtk_eth_soc.c index cbc7339843..0574e71573 100644 --- a/drivers/staging/mt7621-eth/mtk_eth_soc.c +++ b/drivers/staging/mt7621-eth/mtk_eth_soc.c @@ -35,7 +35,6 @@ #include "mtk_eth_soc.h" #include "mdio.h" -#include "ethtool.h" #defineMAX_RX_LENGTH 1536 #define MTK_RX_ETH_HLEN(VLAN_ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN) diff --git a/drivers/staging/mt7621-eth/mtk_eth_soc.h b/drivers/staging/mt7621-eth/mtk_eth_soc.h index 443f88d8af..01deeddfdd 100644 --- a/drivers/staging/mt7621-eth/mtk_eth_soc.h +++ b/drivers/staging/mt7621-eth/mtk_eth_soc.h @@ -23,6 +23,7 @@ #include #include #include +#include "ethtool.h" /* these registers have different offsets depending on the SoC. we use a lookup * table for these -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v2] staging: mt7621-eth: Fix sparse warning in ethtool.c
This fixes the following sparse warning: drivers/staging/mt7621-eth/ethtool.c:213:6: warning: symbol 'mtk_set_ethtool_ops' was not declared. Should it be static? Signed-off-by: Chris Coffey --- Changes in v2: - Per GregKH's feedback (thanks!), don't add unnecessary new .h file dependencies. This patch version reverts those changes and fixes the problem directly in ethtool.c (which is that it didn't include ethtool.h anywhere -- mtk_set_ethtool_ops is not static). drivers/staging/mt7621-eth/ethtool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/staging/mt7621-eth/ethtool.c b/drivers/staging/mt7621-eth/ethtool.c index 38ba0c040a..5268c5ca09 100644 --- a/drivers/staging/mt7621-eth/ethtool.c +++ b/drivers/staging/mt7621-eth/ethtool.c @@ -13,6 +13,7 @@ */ #include "mtk_eth_soc.h" +#include "ethtool.h" static const char mtk_gdma_str[][ETH_GSTRING_LEN] = { #define _FE(x...) # x, -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel