staging: wilc1000: WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

staging: wilc1000: WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Stanislav Kholmanskikh]

Hi!

I noticed that drivers/staging/wilc1000/Kconfic defines:

config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
        bool "Dynamically allocate memory in real time"
        ---help---
          This choice supports dynamic allocation of the memory
          for the receive buffer. The driver will allocate the RX buffer
          when it is required.


"MEMROY" looks suspicious. Is it a typo (MEMORY?) or by intent?

Thanks!

Re: staging: wilc1000: WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Greg KH]

On Thu, Oct 08, 2015 at 09:29:35PM +0300, Stanislav Kholmanskikh wrote:
> Hi!
> 
> I noticed that drivers/staging/wilc1000/Kconfic defines:
> 
> config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
>         bool "Dynamically allocate memory in real time"
>         ---help---
>           This choice supports dynamic allocation of the memory
>           for the receive buffer. The driver will allocate the RX buffer
>           when it is required.
> 
> 
> "MEMROY" looks suspicious. Is it a typo (MEMORY?) or by intent?

Probably a typo, but be sure to see if it lines up with what the code
expects before changing anything.

Ideally in the end this option should be removed as the driver should
only do dynamic allocation, no static allocation should be needed.

thanks,

greg k-h

[PATCH] staging: wilc1000: typo in WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Stanislav Kholmanskikh]

Looking at the code, it seems that "MEMROY" in the config option
name is a typo. It should be "MEMORY" instead.

Changed the config option name accordingly.

Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
---
 drivers/staging/wilc1000/Kconfig  | 2 +-
 drivers/staging/wilc1000/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig
index 59ccecc..d636f46 100644
--- a/drivers/staging/wilc1000/Kconfig
+++ b/drivers/staging/wilc1000/Kconfig
@@ -19,7 +19,7 @@ config WILC1000_PREALLOCATE_AT_LOADING_DRIVER
 	  during initial time. The driver will also free the buffer
 	  by calling network device stop.
 
-config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
+config WILC1000_DYNAMICALLY_ALLOCATE_MEMORY
         bool "Dynamically allocate memory in real time"
         ---help---
 	  This choice supports dynamic allocation of the memory
diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile
index f495061..026609a 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -15,7 +15,7 @@ ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \
 ccflags-$(CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER) += -DMEMORY_STATIC \
 								-DWILC_PREALLOC_AT_INSMOD
 
-ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC
+ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMORY) += -DWILC_NORMAL_ALLOC
 
 
 wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
-- 
1.9.1

Re: [PATCH] staging: wilc1000: typo in WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Dan Carpenter]

On Fri, Oct 09, 2015 at 09:19:07PM +0300, Stanislav Kholmanskikh wrote:
> Looking at the code, it seems that "MEMROY" in the config option
> name is a typo. It should be "MEMORY" instead.
> 
> Changed the config option name accordingly.
> 
> Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>

Just delete it and delete -DWILC_NORMAL_ALLOC as well.

regards,
dan carpenter

[PATCH] staging: wilc1000: remove WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Stanislav Kholmanskikh]

The config option in the subject may be removed, because,
indeed, it only serves as the 'n' value for
CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER

Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
---
 drivers/staging/wilc1000/Kconfig  | 15 ++-------------
 drivers/staging/wilc1000/Makefile |  3 ---
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig
index 59ccecc..2701a01 100644
--- a/drivers/staging/wilc1000/Kconfig
+++ b/drivers/staging/wilc1000/Kconfig
@@ -6,27 +6,16 @@ config WILC1000
 	---help---
 	  This module only support IEEE 802.11n WiFi.
 
-choice
-        prompt "Memory Allocation"
-        depends on WILC1000
-        default WILC1000_PREALLOCATE_AT_LOADING_DRIVER
-
 config WILC1000_PREALLOCATE_AT_LOADING_DRIVER
 	bool "Preallocate memory at loading driver"
+	depends on WILC1000
+	default y
 	---help---
 	  This choice supports static allocation of the memory
 	  for the receive buffer. The driver will allocate the RX buffer
 	  during initial time. The driver will also free the buffer
 	  by calling network device stop.
 
-config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
-        bool "Dynamically allocate memory in real time"
-        ---help---
-	  This choice supports dynamic allocation of the memory
-	  for the receive buffer. The driver will allocate the RX buffer
-	  when it is required.
-endchoice
-
 choice
 	prompt "Bus Type"
 	depends on WILC1000
diff --git a/drivers/staging/wilc1000/Makefile b/drivers/staging/wilc1000/Makefile
index f495061..eb8f51d 100644
--- a/drivers/staging/wilc1000/Makefile
+++ b/drivers/staging/wilc1000/Makefile
@@ -15,9 +15,6 @@ ccflags-y += -I$(src)/ -D__CHECK_ENDIAN__ -DWILC_ASIC_A0 \
 ccflags-$(CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER) += -DMEMORY_STATIC \
 								-DWILC_PREALLOC_AT_INSMOD
 
-ccflags-$(CONFIG_WILC1000_DYNAMICALLY_ALLOCATE_MEMROY) += -DWILC_NORMAL_ALLOC
-
-
 wilc1000-objs := wilc_wfi_cfgoperations.o linux_wlan.o linux_mon.o \
 			wilc_msgqueue.o \
 			coreconfigurator.o host_interface.o \
-- 
1.9.1

Re: staging: wilc1000: WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Tony Cho]

On 2015년 10월 09일 03:29, Stanislav Kholmanskikh wrote:
> Hi!
>
> I noticed that drivers/staging/wilc1000/Kconfic defines:
>
> config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
>          bool "Dynamically allocate memory in real time"
>          ---help---
>            This choice supports dynamic allocation of the memory
>            for the receive buffer. The driver will allocate the RX buffer
>            when it is required.
>
>
> "MEMROY" looks suspicious. Is it a typo (MEMORY?) or by intent?

These parts will be wholly changed but I need to get important driver updates. It will be done soon.

Thanks for your review,

Tony.

> Thanks!

Re: staging: wilc1000: WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Tony Cho]

On 2015년 10월 09일 03:47, Greg KH wrote:
> On Thu, Oct 08, 2015 at 09:29:35PM +0300, Stanislav Kholmanskikh wrote:
>> Hi!
>>
>> I noticed that drivers/staging/wilc1000/Kconfic defines:
>>
>> config WILC1000_DYNAMICALLY_ALLOCATE_MEMROY
>>          bool "Dynamically allocate memory in real time"
>>          ---help---
>>            This choice supports dynamic allocation of the memory
>>            for the receive buffer. The driver will allocate the RX buffer
>>            when it is required.
>>
>>
>> "MEMROY" looks suspicious. Is it a typo (MEMORY?) or by intent?
> Probably a typo, but be sure to see if it lines up with what the code
> expects before changing anything.
>
> Ideally in the end this option should be removed as the driver should
> only do dynamic allocation, no static allocation should be needed.

I agree with Greg's opinion. The team is now restructuring the driver and they will be removed and changed.

Thanks for your valuable opinion,

Tony.

>
> thanks,
>
> greg k-h

Re: [PATCH] staging: wilc1000: remove WILC1000_DYNAMICALLY_ALLOCATE_MEMROY

[Greg KH]

On Sat, Oct 10, 2015 at 03:41:54PM +0300, Stanislav Kholmanskikh wrote:
> The config option in the subject may be removed, because,
> indeed, it only serves as the 'n' value for
> CONFIG_WILC1000_PREALLOCATE_AT_LOADING_DRIVER
> 
> Signed-off-by: Stanislav Kholmanskikh <kholmanskikh.s.s@gmail.com>
> ---
>  drivers/staging/wilc1000/Kconfig  | 15 ++-------------
>  drivers/staging/wilc1000/Makefile |  3 ---
>  2 files changed, 2 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/staging/wilc1000/Kconfig b/drivers/staging/wilc1000/Kconfig
> index 59ccecc..2701a01 100644
> --- a/drivers/staging/wilc1000/Kconfig
> +++ b/drivers/staging/wilc1000/Kconfig
> @@ -6,27 +6,16 @@ config WILC1000
>  	---help---
>  	  This module only support IEEE 802.11n WiFi.
>  
> -choice
> -        prompt "Memory Allocation"
> -        depends on WILC1000
> -        default WILC1000_PREALLOCATE_AT_LOADING_DRIVER
> -
>  config WILC1000_PREALLOCATE_AT_LOADING_DRIVER
>  	bool "Preallocate memory at loading driver"
> +	depends on WILC1000
> +	default y

Hm, why have this now?  Both of these options should go away, please
work on fixing up the code to not need them and then delete the options,
right now you are just deleting config options which doesn't seem wise.

thanks,

greg k-h