From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F109AA3C for ; Fri, 5 Aug 2022 06:39:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40CEAC43470; Fri, 5 Aug 2022 06:39:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1659681583; bh=I+kcE97Ve6/ReO0B8c5180Bc7abr6kASH5KpHGYE8A8=; h=Date:From:To:Subject:References:In-Reply-To:From; b=1hq61QxoWIElS+9Pl/b8sRq11hctbk7P2Ebd6DPZ8el95aG0HUuqJyMoMmRaaojzi qUl3aMHwnnVYaiY3rRlYHbbJnNqN1IyFzjyFLT4oLR5B0dAhYUtZ7oLFFjimQfWD1J cuRWQ6a8gZuYy0u8l2jUu2sT0fqhvZWD3eudoyws= Date: Fri, 5 Aug 2022 08:39:41 +0200 From: Greg KH To: Grzegorz Szymaszek , Larry Finger , Phillip Potter , linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: Re: [PATCH 3/3] staging: r8188eu: make driver metadata macro names more consistent Message-ID: References: <6c83e05e5dbccff5630ccfed9e40bf84c889b647.1659565180.git.gszymaszek@short.pl> <7cc838a1e7f64c9aa88deffdb7986fbe55753be8.1659565180.git.gszymaszek@short.pl> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <7cc838a1e7f64c9aa88deffdb7986fbe55753be8.1659565180.git.gszymaszek@short.pl> On Thu, Aug 04, 2022 at 12:29:10AM +0200, Grzegorz Szymaszek wrote: > Rename DRIVERVERSION to DRV_VERSION so that it looks more alike the > other macros, DRV_NAME and FW_*, and matches the most popular (as it > seems from a quick review) conventions in other drivers. > > Signed-off-by: Grzegorz Szymaszek > --- > drivers/staging/r8188eu/include/drv_types.h | 5 ++--- > drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h > index f51b83515953..3328c66d1ef1 100644 > --- a/drivers/staging/r8188eu/include/drv_types.h > +++ b/drivers/staging/r8188eu/include/drv_types.h > @@ -10,8 +10,6 @@ > #ifndef __DRV_TYPES_H__ > #define __DRV_TYPES_H__ > > -#define DRV_NAME "r8188eu" This should just be KBUILD_MODNAME, no need to create yet-another-macro for this one. > - > #include "osdep_service.h" > #include "wlan_bssdef.h" > #include "rtw_ht.h" > @@ -36,7 +34,8 @@ > #include "rtl8188e_hal.h" > #include "rtw_fw.h" > > -#define DRIVERVERSION "v4.1.4_6773.20130222" > +#define DRV_NAME "r8188eu" Again, KBUILD_MODNAME > +#define DRV_VERSION "v4.1.4_6773.20130222" As the driver is now in the kernel, this "version" string can just go away. Can you redo this patch to do the DRV_NAME thing first, and then drop the DRV_VERSION field after that? thanks, greg k-h