Remove the function MACbCompareContext() that is not used anywhere.
This was partially found by using a static code analysis program called cppcheck.
Signed-off-by: Rickard Strandqvist <[email protected]>
---
drivers/staging/vt6655/mac.c | 42 ------------------------------------------
drivers/staging/vt6655/mac.h | 1 -
2 files changed, 43 deletions(-)
diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
index e3b0b7f..8254879 100644
--- a/drivers/staging/vt6655/mac.c
+++ b/drivers/staging/vt6655/mac.c
@@ -49,7 +49,6 @@
* MACvSetPacketFilter - Set MAC Address Filter
* MACvSaveContext - Save Context of MAC Registers
* MACvRestoreContext - Restore Context of MAC Registers
- * MACbCompareContext - Compare if values of MAC Registers same as Context
* MACbSoftwareReset - Software Reset MAC
* MACbSafeRxOff - Turn Off MAC Rx
* MACbSafeTxOff - Turn Off MAC Tx
@@ -702,47 +701,6 @@ void MACvRestoreContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf)
/*
* Description:
- * Compare if MAC registers same as context buffer
- *
- * Parameters:
- * In:
- * dwIoBase - Base Address for MAC
- * pbyCxtBuf - Context buffer
- * Out:
- * none
- *
- * Return Value: true if all values are the same; otherwise false
- *
- */
-bool MACbCompareContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf)
-{
- unsigned long dwData;
-
- // compare MAC context to determine if this is a power lost init,
- // return true for power remaining init, return false for power lost init
-
- // compare CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR
- VNSvInPortD(dwIoBase + MAC_REG_TXDMAPTR0, &dwData);
- if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0))
- return false;
-
- VNSvInPortD(dwIoBase + MAC_REG_AC0DMAPTR, &dwData);
- if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR))
- return false;
-
- VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR0, &dwData);
- if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0))
- return false;
-
- VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR1, &dwData);
- if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1))
- return false;
-
- return true;
-}
-
-/*
- * Description:
* Software Reset MAC
*
* Parameters:
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 0bf9375..811c459 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -1006,7 +1006,6 @@ void MACvSetPacketFilter(void __iomem *dwIoBase, unsigned short wFilterType);
void MACvSaveContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf);
void MACvRestoreContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf);
-bool MACbCompareContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf);
bool MACbSoftwareReset(void __iomem *dwIoBase);
bool MACbSafeSoftwareReset(void __iomem *dwIoBase);
--
1.7.10.4
On Sun, Dec 07, 2014 at 11:02:44PM +0100, Rickard Strandqvist wrote:
> Remove the function MACbCompareContext() that is not used anywhere.
>
> This was partially found by using a static code analysis program called cppcheck.
>
> Signed-off-by: Rickard Strandqvist <[email protected]>
> ---
not applying to next-20141205
sudip
> drivers/staging/vt6655/mac.c | 42 ------------------------------------------
> drivers/staging/vt6655/mac.h | 1 -
> 2 files changed, 43 deletions(-)
>
> diff --git a/drivers/staging/vt6655/mac.c b/drivers/staging/vt6655/mac.c
> index e3b0b7f..8254879 100644
> --- a/drivers/staging/vt6655/mac.c
> +++ b/drivers/staging/vt6655/mac.c
> @@ -49,7 +49,6 @@
> * MACvSetPacketFilter - Set MAC Address Filter
> * MACvSaveContext - Save Context of MAC Registers
> * MACvRestoreContext - Restore Context of MAC Registers
> - * MACbCompareContext - Compare if values of MAC Registers same as Context
> * MACbSoftwareReset - Software Reset MAC
> * MACbSafeRxOff - Turn Off MAC Rx
> * MACbSafeTxOff - Turn Off MAC Tx
> @@ -702,47 +701,6 @@ void MACvRestoreContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf)
>
> /*
> * Description:
> - * Compare if MAC registers same as context buffer
> - *
> - * Parameters:
> - * In:
> - * dwIoBase - Base Address for MAC
> - * pbyCxtBuf - Context buffer
> - * Out:
> - * none
> - *
> - * Return Value: true if all values are the same; otherwise false
> - *
> - */
> -bool MACbCompareContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf)
> -{
> - unsigned long dwData;
> -
> - // compare MAC context to determine if this is a power lost init,
> - // return true for power remaining init, return false for power lost init
> -
> - // compare CURR_RX_DESC_ADDR, CURR_TX_DESC_ADDR
> - VNSvInPortD(dwIoBase + MAC_REG_TXDMAPTR0, &dwData);
> - if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_TXDMAPTR0))
> - return false;
> -
> - VNSvInPortD(dwIoBase + MAC_REG_AC0DMAPTR, &dwData);
> - if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_AC0DMAPTR))
> - return false;
> -
> - VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR0, &dwData);
> - if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR0))
> - return false;
> -
> - VNSvInPortD(dwIoBase + MAC_REG_RXDMAPTR1, &dwData);
> - if (dwData != *(unsigned long *)(pbyCxtBuf + MAC_REG_RXDMAPTR1))
> - return false;
> -
> - return true;
> -}
> -
> -/*
> - * Description:
> * Software Reset MAC
> *
> * Parameters:
> diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
> index 0bf9375..811c459 100644
> --- a/drivers/staging/vt6655/mac.h
> +++ b/drivers/staging/vt6655/mac.h
> @@ -1006,7 +1006,6 @@ void MACvSetPacketFilter(void __iomem *dwIoBase, unsigned short wFilterType);
>
> void MACvSaveContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf);
> void MACvRestoreContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf);
> -bool MACbCompareContext(void __iomem *dwIoBase, unsigned char *pbyCxtBuf);
>
> bool MACbSoftwareReset(void __iomem *dwIoBase);
> bool MACbSafeSoftwareReset(void __iomem *dwIoBase);
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/