From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757367AbbE2UxJ (ORCPT ); Fri, 29 May 2015 16:53:09 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:59478 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756859AbbE2Uww (ORCPT ); Fri, 29 May 2015 16:52:52 -0400 From: Arnd Bergmann To: Greg KH Cc: Rachel Kim , Dean Lee , Chris Park , devel@driverdev.osuosl.org, nicolas.ferre@atmel.com, Johnny Kim , linux-kernel@vger.kernel.org, Arnd Bergmann Subject: [PATCH 04/16] staging: wilc1000: remove __DRIVER_VERSION__ macro Date: Fri, 29 May 2015 22:52:15 +0200 Message-Id: <1432932747-3739705-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1432932747-3739705-1-git-send-email-arnd@arndb.de> References: <1432932747-3739705-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:GoRDDlN5lenJXNB+hUn3HUMcjR800ikDt2IAWbktQ+f1uO/eGbf vnTx3MWxa2mYwteIHZ5A4XlTgwBlwiMQJFoAhvNhI2Yu4XI4dkOrktzxb40TsbPTMUy9CkV 8jXGR275NMqmvnuCvOrg8D+r62Q0HJMvwHY5Lku/C5m/u5Ns+O+sinN22Ez+Tgnl9feaTKF HxKhSdQRI/71n/2Y1bKNg== X-UI-Out-Filterresults: notjunk:1;V01:K0:/qftYuiZrSQ=:ZCnefdMCu/ssw7SgzoZKxZ mraoi8zGoJ/n57rVrBnMiEwJwkfhqt0u94iX0KQP8a3CN2N3gO64fB7JEeXLUITaLMOJqABqS 3crn01RAUO/aTE+3UFwlDxxAogkuwxZ/xTOauNKMF+u5I4sot8zpjK2ZrBW6G4g40/+OVUTLu kiHjOwcwPV+K54dR1X2GgBg53mManVpeJiHWzfTozVU8YWDRg+gA7fgtBDAOAU3njwSo9A0Ty lzI5qHYMcZavzesv5R+vIPmi2d9tjYjKMLlJp45ANo1zThQ43qKodMg0gA+xW+r9hUZ0NFTjH qey0j0UsRJQ6Zf4LrJ53QJz+trSh8X+DiIOK8zIUfzOIimhqyZITq1xuGzgXbY3Ams4MY02iR AC5lfRIhIxjiIuszq5n1P+MHj1agFZuuLCMG8JX5eaS2nwlWHLTUVEka/IK4q1CUZKX/mir+S 02NAAhVImBx6rdFrK1bto5L80Q8Z9dbjYGJMrxdOTedkDfmlL2uf6fp/SbRtI6w9LDDgL5g1L El1zmzIurzqaRAFa0xrt0AAo/cWPMHmiAyGFCvFpq34dpQaRjjdAO2CdYEvzTkThhvCds/377 XxOBZW726WP+hpf+ek4JCp502q6p820O+zSW5ZurhNf1F2jsvV55UYXot4+pk/XkCCuO6rMOF YeX/LghLtXH2WoGLvDpRHYArI Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver version is meaningless, and in particular does not have to be passed from the Makefile. This removes the macros, but leaves the behavior of printing the 10.2 version untouched for the moment. Signed-off-by: Arnd Bergmann --- drivers/staging/wilc1000/Makefile | 6 ------ drivers/staging/wilc1000/linux_wlan.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile index 4aa5f6764df4..13e3ed8ef31e 100644 --- a/drivers/staging/wilc1000/Makefile +++ b/drivers/staging/wilc1000/Makefile @@ -32,9 +32,3 @@ wilc1000-objs := wilc_wfi_netdevice.o wilc_wfi_cfgoperations.o linux_wlan.o linu wilc1000-$(CONFIG_WILC1000_SDIO) += linux_wlan_sdio.o wilc1000-$(CONFIG_WILC1000_SPI) += linux_wlan_spi.o - -WILC1000_SRC_VERSION = 10.0 -PATCHLEVEL = 2 -WILC1000_FW_VERSION = 0 - -ccflags-y += -D__DRIVER_VERSION__=\"$(WILC1000_SRC_VERSION).$(PATCHLEVEL)\" diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 3f8b3c54f196..2a74441af09e 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -2747,7 +2747,7 @@ static int __init init_wilc_driver(void) #endif printk("IN INIT FUNCTION\n"); - printk("*** WILC1000 driver VERSION=[%s] FW_VER=[%s] ***\n", __DRIVER_VERSION__, __DRIVER_VERSION__); + printk("*** WILC1000 driver VERSION=[10.2] FW_VER=[10.2] ***\n"); linux_wlan_device_power(1); msleep(100); -- 2.1.0.rc2