Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb7482bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: wlags49_h2: remove custom ways of creating a module name 



Just use KBUILD_MODNAME, don't try to hand-roll the same thing with odd
logic.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da61fde7

drivers/staging/wlags49_h2/wl_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ int wl_adapter_insert(struct pcmcia_device *link) 
	SET_NETDEV_DEV(dev, &link->dev);

	ret = register_netdev(dev);

	if (ret != 0) {

		printk("%s: register_netdev() failed\n", MODULE_NAME);

		printk("%s: register_netdev() failed\n", KBUILD_MODNAME);

		goto failed;

	}

drivers/staging/wlags49_h2/wl_main.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static p_u32 pc_debug = DBG_LVL; 
 */ p_u32    DebugFlag = ~0; //recognizable "undefined value" rather then DBG_DEFAULTS;

//MODULE_PARM(DebugFlag, "l");



dbg_info_t   wl_info = { DBG_MOD_NAME, 0, 0 };

dbg_info_t   wl_info = { KBUILD_MODNAME, 0, 0 };

dbg_info_t  *DbgInfo = &wl_info;



#endif /* DBG */

drivers/staging/wlags49_h2/wl_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void wl_pci_dma_hcf_reclaim_rx( struct wl_private *lp ); 
 * PCI module function registration

 ******************************************************************************/

static struct pci_driver wl_driver = {

	.name	  = MODULE_NAME,

	.name	  = KBUILD_MODNAME,

	.id_table = wl_pci_tbl,

	.probe	  = wl_pci_probe,

	.remove	  = wl_pci_remove,

drivers/staging/wlags49_h2/wl_version.h

+1 −20
Original line number Diff line number Diff line
@@ -115,31 +115,12 @@ err: define bus type; 
#define DRV_VARIANT         2

#endif // HERMES25



#ifdef BUS_PCMCIA

#if defined HERMES25

#define MODULE_NAME         DRIVER_NAME "_h25_cs"

#else

#define MODULE_NAME         DRIVER_NAME "_h2_cs"

#endif  /* HERMES25 */

#elif defined BUS_PCI

#if defined HERMES25

#define MODULE_NAME         DRIVER_NAME "_h25"

#else

#define MODULE_NAME         DRIVER_NAME "_h2"

#endif  /* HERMES25 */

#endif  /* BUS_XXX */



#define VERSION_INFO	MODULE_NAME " v" DRV_VERSION_STR	\

#define VERSION_INFO	KBUILD_MODNAME " v" DRV_VERSION_STR	\

			" for " BUS_TYPE ", by " VENDOR_NAME



/* The version of wireless extensions we support */

#define WIRELESS_SUPPORT    21



//#define DBG_MOD_NAME         DRIVER_NAME ":" BUS_TYPE ":" HW_TYPE ":" FW_TYPE

#define DBG_MOD_NAME        MODULE_NAME







/*******************************************************************************

 *  bus architecture specific defines, includes, etc.

 ******************************************************************************/