* [PATCH 1/3] staging: bcm: Remove code that will never execute
2012-07-10 1:32 [PATCH 0/3] staging: bcm: Cleanup bcm driver Marcos Paulo de Souza
@ 2012-07-10 1:32 ` Marcos Paulo de Souza
2012-07-10 1:32 ` [PATCH 2/3] staging: bcm: Remove all commented macros Marcos Paulo de Souza
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Marcos Paulo de Souza @ 2012-07-10 1:32 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-kernel, klmckinney1, dan.carpenter, standby24x7,
Marcos Paulo de Souza
This patch removes all references of "if 0" blocks in the bcm drivers.
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/bcm/Misc.c | 63 --------------------------------------------
1 file changed, 63 deletions(-)
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index c36fd76..d7c662d 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -402,30 +402,6 @@ INT CopyBufferToControlPacket(struct bcm_mini_adapter *Adapter, PVOID ioBuffer)
return Status;
}
-#if 0
-/*****************************************************************
-* Function - SendStatisticsPointerRequest()
-*
-* Description - This function builds and forwards the Statistics
-* Pointer Request control Packet.
-*
-* Parameters - Adapter : Pointer to Adapter structure.
-* - pstStatisticsPtrRequest : Pointer to link request.
-*
-* Returns - None.
-*****************************************************************/
-static VOID SendStatisticsPointerRequest(struct bcm_mini_adapter *Adapter, struct bcm_link_request *pstStatisticsPtrRequest)
-{
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "======>");
- pstStatisticsPtrRequest->Leader.Status = STATS_POINTER_REQ_STATUS;
- pstStatisticsPtrRequest->Leader.PLength = sizeof(ULONG); /* minimum 4 bytes */
- pstStatisticsPtrRequest->szData[0] = STATISTICS_POINTER_REQ;
- CopyBufferToControlPacket(Adapter, pstStatisticsPtrRequest);
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_RX, RX_DPC, DBG_LVL_ALL, "<=====");
- return;
-}
-#endif
-
/******************************************************************
* Function - LinkMessage()
*
@@ -1217,45 +1193,6 @@ static VOID doPowerAutoCorrection(struct bcm_mini_adapter *psAdapter)
}
}
-#if 0
-static unsigned char *ReadMacAddrEEPROM(struct bcm_mini_adapter *Adapter, ulong dwAddress)
-{
- int status = 0, i = 0;
- unsigned int temp = 0;
- unsigned char *pucmacaddr = kmalloc(MAC_ADDRESS_SIZE, GFP_KERNEL);
- int bytes;
-
- if (!pucmacaddr) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "No Buffers to Read the EEPROM Address\n");
- return NULL;
- }
-
- dwAddress |= 0x5b000000;
- status = wrmalt(Adapter, EEPROM_COMMAND_Q_REG, (PUINT)&dwAddress, sizeof(UINT));
- if (status != STATUS_SUCCESS) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "wrm Failed..\n");
- kfree(pucmacaddr);
- pucmacaddr = NULL;
- goto OUT;
- }
-
- for (i = 0; i < MAC_ADDRESS_SIZE; i++) {
- bytes = rdmalt(Adapter, EEPROM_READ_DATA_Q_REG, &temp, sizeof(temp));
- if (bytes < 0) {
- status = bytes;
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, "rdm Failed..\n");
- kfree(pucmacaddr);
- pucmacaddr = NULL;
- goto OUT;
- }
- pucmacaddr[i] = temp & 0xff;
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL, "%x\n", pucmacaddr[i]);
- }
-OUT:
- return pucmacaddr;
-}
-#endif
-
static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
{
UINT uiIndex = 0;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/3] staging: bcm: Remove all commented macros
2012-07-10 1:32 [PATCH 0/3] staging: bcm: Cleanup bcm driver Marcos Paulo de Souza
2012-07-10 1:32 ` [PATCH 1/3] staging: bcm: Remove code that will never execute Marcos Paulo de Souza
@ 2012-07-10 1:32 ` Marcos Paulo de Souza
2012-07-10 1:32 ` [PATCH 3/3] staging: bcm: Misc.c: Remove unused macros Marcos Paulo de Souza
2012-07-10 2:40 ` [PATCH 0/3] staging: bcm: Cleanup bcm driver Kevin McKinney
3 siblings, 0 replies; 11+ messages in thread
From: Marcos Paulo de Souza @ 2012-07-10 1:32 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-kernel, klmckinney1, dan.carpenter, standby24x7,
Marcos Paulo de Souza
All these macros are commented, and can be removed.
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/bcm/CmHost.c | 1 -
drivers/staging/bcm/Debug.h | 5 -----
drivers/staging/bcm/Macros.h | 1 -
drivers/staging/bcm/PHSDefines.h | 1 -
4 files changed, 8 deletions(-)
diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c
index 9c8c9b1..b54ec97 100644
--- a/drivers/staging/bcm/CmHost.c
+++ b/drivers/staging/bcm/CmHost.c
@@ -4,7 +4,6 @@
* Management.
************************************************************/
-/* #define CONN_MSG */
#include "headers.h"
enum E_CLASSIFIER_ACTION {
diff --git a/drivers/staging/bcm/Debug.h b/drivers/staging/bcm/Debug.h
index 420382d..8018a18 100644
--- a/drivers/staging/bcm/Debug.h
+++ b/drivers/staging/bcm/Debug.h
@@ -42,10 +42,6 @@
#define ARP_REQ (TX<<5)
#define ARP_RESP (TX<<6)
-// dhcp.c
-//#define DHCP TX
-//#define DHCP_REQ (DHCP<<7)
-
// Leakybucket.c
#define TOKEN_COUNTS (TX<<8)
#define CHECK_TOKENS (TX<<9)
@@ -147,7 +143,6 @@ DriverEntry.c, bcmfwup.c, ChipDetectTask.c, HaltnReset.c, InterfaceDDR.c */
#define HOST_MIBS (OTHERS << 28)
#define CONN_MSG (CMHOST << 29)
-//#define OTHERS_MISC (OTHERS << 29) // ProcSupport.c
/*-----------------END SUBTYPEs------------------------------------------*/
diff --git a/drivers/staging/bcm/Macros.h b/drivers/staging/bcm/Macros.h
index b5ca6f6..46f5f0f 100644
--- a/drivers/staging/bcm/Macros.h
+++ b/drivers/staging/bcm/Macros.h
@@ -6,7 +6,6 @@
#define TX_TIMER_PERIOD 10 /*10 msec*/
#define MAX_CLASSIFIERS 100
-/* #define MAX_CLASSIFIERS_PER_SF 20 */
#define MAX_TARGET_DSX_BUFFERS 24
#define MAX_CNTRL_PKTS 100
diff --git a/drivers/staging/bcm/PHSDefines.h b/drivers/staging/bcm/PHSDefines.h
index eed4cfc..6016fc5 100644
--- a/drivers/staging/bcm/PHSDefines.h
+++ b/drivers/staging/bcm/PHSDefines.h
@@ -27,7 +27,6 @@
#define PHS_BUFFER_SIZE 1532
-//#define MAX_PHS_LENGTHS 100
#define MAX_PHSRULE_PER_SF 20
#define MAX_SERVICEFLOWS 17
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/3] staging: bcm: Misc.c: Remove unused macros
2012-07-10 1:32 [PATCH 0/3] staging: bcm: Cleanup bcm driver Marcos Paulo de Souza
2012-07-10 1:32 ` [PATCH 1/3] staging: bcm: Remove code that will never execute Marcos Paulo de Souza
2012-07-10 1:32 ` [PATCH 2/3] staging: bcm: Remove all commented macros Marcos Paulo de Souza
@ 2012-07-10 1:32 ` Marcos Paulo de Souza
2012-07-10 2:40 ` [PATCH 0/3] staging: bcm: Cleanup bcm driver Kevin McKinney
3 siblings, 0 replies; 11+ messages in thread
From: Marcos Paulo de Souza @ 2012-07-10 1:32 UTC (permalink / raw)
To: gregkh
Cc: devel, linux-kernel, klmckinney1, dan.carpenter, standby24x7,
Marcos Paulo de Souza
These macros were reported by forgotten-macros tool
(https://github.com/marcosps/forgotten_macros).
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
---
drivers/staging/bcm/Misc.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/bcm/Misc.c b/drivers/staging/bcm/Misc.c
index d7c662d..9a60d4c 100644
--- a/drivers/staging/bcm/Misc.c
+++ b/drivers/staging/bcm/Misc.c
@@ -1206,9 +1206,6 @@ static void convertEndian(B_UINT8 rwFlag, PUINT puiBuffer, UINT uiByteCount)
}
}
-#define CACHE_ADDRESS_MASK 0x80000000
-#define UNCACHE_ADDRESS_MASK 0xa0000000
-
int rdm(struct bcm_mini_adapter *Adapter, UINT uiAddress, PCHAR pucBuff, size_t sSize)
{
return Adapter->interface_rdm(Adapter->pvInterfaceAdapter,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 1:32 [PATCH 0/3] staging: bcm: Cleanup bcm driver Marcos Paulo de Souza
` (2 preceding siblings ...)
2012-07-10 1:32 ` [PATCH 3/3] staging: bcm: Misc.c: Remove unused macros Marcos Paulo de Souza
@ 2012-07-10 2:40 ` Kevin McKinney
2012-07-10 2:48 ` Marcos Souza
3 siblings, 1 reply; 11+ messages in thread
From: Kevin McKinney @ 2012-07-10 2:40 UTC (permalink / raw)
To: Marcos Paulo de Souza, klmckinney1
Cc: gregkh, devel, linux-kernel, dan.carpenter, standby24x7
On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
> Hi Kernel guys!
>
> This new patchset tries to clean a little the bcm driver, removing
> some unused macros and some dead code.
>
> These macros and dead code were reported by the forgotten-macros tool
> (https://github.com/marcosps/forgotten_macros).
>
> The tool is under development, but all the patches looks like OK.
>
> This patchset is based in staging-next.
>
> Thanks guys!
The patchset looks good!
Thanks,
Kevin
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 2:40 ` [PATCH 0/3] staging: bcm: Cleanup bcm driver Kevin McKinney
@ 2012-07-10 2:48 ` Marcos Souza
2012-07-10 12:38 ` Kevin McKinney
0 siblings, 1 reply; 11+ messages in thread
From: Marcos Souza @ 2012-07-10 2:48 UTC (permalink / raw)
To: Kevin McKinney; +Cc: gregkh, devel, linux-kernel, dan.carpenter, standby24x7
2012/7/9 Kevin McKinney <klmckinney1@gmail.com>:
> On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
>> Hi Kernel guys!
>>
>> This new patchset tries to clean a little the bcm driver, removing
>> some unused macros and some dead code.
>>
>> These macros and dead code were reported by the forgotten-macros tool
>> (https://github.com/marcosps/forgotten_macros).
>>
>> The tool is under development, but all the patches looks like OK.
>>
>> This patchset is based in staging-next.
>>
>> Thanks guys!
>
> The patchset looks good!
Thanks for the answer Kevin!!
So, do I have your ack?
> Thanks,
> Kevin
--
Att,
Marcos Paulo de Souza
Acadêmico de Ciencia da Computação - FURB - SC
"Uma vida sem desafios é uma vida sem razão"
"A life without challenges, is a non reason life"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 2:48 ` Marcos Souza
@ 2012-07-10 12:38 ` Kevin McKinney
2012-07-10 12:51 ` Dan Carpenter
0 siblings, 1 reply; 11+ messages in thread
From: Kevin McKinney @ 2012-07-10 12:38 UTC (permalink / raw)
To: Marcos Souza
Cc: gregkh, devel, linux-kernel, dan.carpenter, standby24x7, klmckinney1
On Mon, Jul 09, 2012 at 11:48:09PM -0300, Marcos Souza wrote:
> 2012/7/9 Kevin McKinney <klmckinney1@gmail.com>:
> > On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
> >> Hi Kernel guys!
> >>
> >> This new patchset tries to clean a little the bcm driver, removing
> >> some unused macros and some dead code.
> >>
> >> These macros and dead code were reported by the forgotten-macros tool
> >> (https://github.com/marcosps/forgotten_macros).
> >>
> >> The tool is under development, but all the patches looks like OK.
> >>
> >> This patchset is based in staging-next.
> >>
> >> Thanks guys!
> >
> > The patchset looks good!
>
> Thanks for the answer Kevin!!
>
> So, do I have your ack?
Yes, I ack.
>
>
>
> --
> Att,
>
> Marcos Paulo de Souza
> Acadêmico de Ciencia da Computação - FURB - SC
> "Uma vida sem desafios é uma vida sem razão"
> "A life without challenges, is a non reason life"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 12:38 ` Kevin McKinney
@ 2012-07-10 12:51 ` Dan Carpenter
2012-07-10 13:24 ` Kevin McKinney
0 siblings, 1 reply; 11+ messages in thread
From: Dan Carpenter @ 2012-07-10 12:51 UTC (permalink / raw)
To: Kevin McKinney; +Cc: Marcos Souza, gregkh, devel, linux-kernel, standby24x7
On Tue, Jul 10, 2012 at 08:38:41AM -0400, Kevin McKinney wrote:
> On Mon, Jul 09, 2012 at 11:48:09PM -0300, Marcos Souza wrote:
> > 2012/7/9 Kevin McKinney <klmckinney1@gmail.com>:
> > > On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
> > >> Hi Kernel guys!
> > >>
> > >> This new patchset tries to clean a little the bcm driver, removing
> > >> some unused macros and some dead code.
> > >>
> > >> These macros and dead code were reported by the forgotten-macros tool
> > >> (https://github.com/marcosps/forgotten_macros).
> > >>
> > >> The tool is under development, but all the patches looks like OK.
> > >>
> > >> This patchset is based in staging-next.
> > >>
> > >> Thanks guys!
> > >
> > > The patchset looks good!
> >
> > Thanks for the answer Kevin!!
> >
> > So, do I have your ack?
> Yes, I ack.
The normal format is:
Acked-by: Your Name <email@address.com>
Some maintainers have scripts which pick Acked-by tags automatically
or even if they don't they can copy and paste it.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 12:51 ` Dan Carpenter
@ 2012-07-10 13:24 ` Kevin McKinney
2012-07-10 13:31 ` Dan Carpenter
0 siblings, 1 reply; 11+ messages in thread
From: Kevin McKinney @ 2012-07-10 13:24 UTC (permalink / raw)
To: Dan Carpenter; +Cc: Marcos Souza, gregkh, devel, linux-kernel, standby24x7
On Tue, Jul 10, 2012 at 8:51 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Tue, Jul 10, 2012 at 08:38:41AM -0400, Kevin McKinney wrote:
>> On Mon, Jul 09, 2012 at 11:48:09PM -0300, Marcos Souza wrote:
>> > 2012/7/9 Kevin McKinney <klmckinney1@gmail.com>:
>> > > On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
>> > >> Hi Kernel guys!
>> > >>
>> > >> This new patchset tries to clean a little the bcm driver, removing
>> > >> some unused macros and some dead code.
>> > >>
>> > >> These macros and dead code were reported by the forgotten-macros tool
>> > >> (https://github.com/marcosps/forgotten_macros).
>> > >>
>> > >> The tool is under development, but all the patches looks like OK.
>> > >>
>> > >> This patchset is based in staging-next.
>> > >>
>> > >> Thanks guys!
>> > >
>> > > The patchset looks good!
>> >
>> > Thanks for the answer Kevin!!
>> >
>> > So, do I have your ack?
>> Yes, I ack.
>
> The normal format is:
>
> Acked-by: Your Name <email@address.com>
>
> Some maintainers have scripts which pick Acked-by tags automatically
> or even if they don't they can copy and paste it.
Okay, thanks for this info Dan. I will see if I can write this script.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 13:24 ` Kevin McKinney
@ 2012-07-10 13:31 ` Dan Carpenter
2012-07-10 13:47 ` Kevin McKinney
0 siblings, 1 reply; 11+ messages in thread
From: Dan Carpenter @ 2012-07-10 13:31 UTC (permalink / raw)
To: Kevin McKinney; +Cc: devel, gregkh, linux-kernel, Marcos Souza
On Tue, Jul 10, 2012 at 09:24:23AM -0400, Kevin McKinney wrote:
> On Tue, Jul 10, 2012 at 8:51 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> > On Tue, Jul 10, 2012 at 08:38:41AM -0400, Kevin McKinney wrote:
> >> On Mon, Jul 09, 2012 at 11:48:09PM -0300, Marcos Souza wrote:
> >> > 2012/7/9 Kevin McKinney <klmckinney1@gmail.com>:
> >> > > On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
> >> > >> Hi Kernel guys!
> >> > >>
> >> > >> This new patchset tries to clean a little the bcm driver, removing
> >> > >> some unused macros and some dead code.
> >> > >>
> >> > >> These macros and dead code were reported by the forgotten-macros tool
> >> > >> (https://github.com/marcosps/forgotten_macros).
> >> > >>
> >> > >> The tool is under development, but all the patches looks like OK.
> >> > >>
> >> > >> This patchset is based in staging-next.
> >> > >>
> >> > >> Thanks guys!
> >> > >
> >> > > The patchset looks good!
> >> >
> >> > Thanks for the answer Kevin!!
> >> >
> >> > So, do I have your ack?
> >> Yes, I ack.
> >
> > The normal format is:
> >
> > Acked-by: Your Name <email@address.com>
> >
> > Some maintainers have scripts which pick Acked-by tags automatically
> > or even if they don't they can copy and paste it.
>
> Okay, thanks for this info Dan. I will see if I can write this script.
>
No, what I'm saying is that I know Dave Miller uses a script which
pulls the Acked-by's out of email threads and adds them
automatically. I don't know how Greg does it, but it's better to
use the normal format.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/3] staging: bcm: Cleanup bcm driver
2012-07-10 13:31 ` Dan Carpenter
@ 2012-07-10 13:47 ` Kevin McKinney
0 siblings, 0 replies; 11+ messages in thread
From: Kevin McKinney @ 2012-07-10 13:47 UTC (permalink / raw)
To: Dan Carpenter; +Cc: devel, gregkh, linux-kernel, Marcos Souza
On Tue, Jul 10, 2012 at 9:31 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
> On Tue, Jul 10, 2012 at 09:24:23AM -0400, Kevin McKinney wrote:
>> On Tue, Jul 10, 2012 at 8:51 AM, Dan Carpenter <dan.carpenter@oracle.com> wrote:
>> > On Tue, Jul 10, 2012 at 08:38:41AM -0400, Kevin McKinney wrote:
>> >> On Mon, Jul 09, 2012 at 11:48:09PM -0300, Marcos Souza wrote:
>> >> > 2012/7/9 Kevin McKinney <klmckinney1@gmail.com>:
>> >> > > On Mon, Jul 09, 2012 at 10:32:37PM -0300, Marcos Paulo de Souza wrote:
>> >> > >> Hi Kernel guys!
>> >> > >>
>> >> > >> This new patchset tries to clean a little the bcm driver, removing
>> >> > >> some unused macros and some dead code.
>> >> > >>
>> >> > >> These macros and dead code were reported by the forgotten-macros tool
>> >> > >> (https://github.com/marcosps/forgotten_macros).
>> >> > >>
>> >> > >> The tool is under development, but all the patches looks like OK.
>> >> > >>
>> >> > >> This patchset is based in staging-next.
>> >> > >>
>> >> > >> Thanks guys!
>> >> > >
>> >> > > The patchset looks good!
>> >> >
>> >> > Thanks for the answer Kevin!!
>> >> >
>> >> > So, do I have your ack?
>> >> Yes, I ack.
>> >
>> > The normal format is:
>> >
>> > Acked-by: Your Name <email@address.com>
>> >
>> > Some maintainers have scripts which pick Acked-by tags automatically
>> > or even if they don't they can copy and paste it.
>>
>> Okay, thanks for this info Dan. I will see if I can write this script.
>>
>
> No, what I'm saying is that I know Dave Miller uses a script which
> pulls the Acked-by's out of email threads and adds them
> automatically. I don't know how Greg does it, but it's better to
> use the normal format.
Oh, I see. Okay I will use the normal format.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 11+ messages in thread