Re: [PATCH v2 1/2] staging: cxt1e1: Prefix ambiguous variable names with 'cxt1e1_' for clarity
On Tue, Jul 22, 2014 at 08:34:55PM -0400, Jeff Oczek wrote: > Changed names of ambiguous sounding variable names as follows > > error_flag -> cxt1e1_error_flag > max_mtu_default -> cxt1e1_max_mtu_default > max_txdesc_used -> cxt1e1_max_txdesc_used > max_txdesc_default -> cxt1e1_max_txdesc_default > max_rxdesc_used -> cxt1e1_max_rxdesc_used > max_rxdesc_default -> cxt1e1_max_rxdesc_default > > Since max_txdesc_used, max_rxdesc_used are module parameters, these were > changed from global to static and the module init function assigns the values > to the newly named global variables > > Signed-off-by: Jeff Oczek > --- > drivers/staging/cxt1e1/hwprobe.c | 7 ++--- > drivers/staging/cxt1e1/linux.c | 53 > +- > drivers/staging/cxt1e1/musycc.c| 4 +-- > drivers/staging/cxt1e1/pmcc4_drv.c | 22 +--- > drivers/staging/cxt1e1/sbeproc.c | 6 ++--- > 5 files changed, 51 insertions(+), 41 deletions(-) This driver isn't even in my kernel tree anymore, so how can I apply it? What kernel branch/version did you make it against? Please always work against linux-next, or my staging-next of my staging.git kernel tree when sending patches. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH v2 1/2] staging: cxt1e1: Prefix ambiguous variable names with 'cxt1e1_' for clarity
On Tue, Jul 22, 2014 at 08:34:55PM -0400, Jeff Oczek wrote: Changed names of ambiguous sounding variable names as follows error_flag - cxt1e1_error_flag max_mtu_default - cxt1e1_max_mtu_default max_txdesc_used - cxt1e1_max_txdesc_used max_txdesc_default - cxt1e1_max_txdesc_default max_rxdesc_used - cxt1e1_max_rxdesc_used max_rxdesc_default - cxt1e1_max_rxdesc_default Since max_txdesc_used, max_rxdesc_used are module parameters, these were changed from global to static and the module init function assigns the values to the newly named global variables Signed-off-by: Jeff Oczek jeffoc...@gmail.com --- drivers/staging/cxt1e1/hwprobe.c | 7 ++--- drivers/staging/cxt1e1/linux.c | 53 +- drivers/staging/cxt1e1/musycc.c| 4 +-- drivers/staging/cxt1e1/pmcc4_drv.c | 22 +--- drivers/staging/cxt1e1/sbeproc.c | 6 ++--- 5 files changed, 51 insertions(+), 41 deletions(-) This driver isn't even in my kernel tree anymore, so how can I apply it? What kernel branch/version did you make it against? Please always work against linux-next, or my staging-next of my staging.git kernel tree when sending patches. thanks, greg k-h -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH v2 1/2] staging: cxt1e1: Prefix ambiguous variable names with 'cxt1e1_' for clarity
Changed names of ambiguous sounding variable names as follows error_flag -> cxt1e1_error_flag max_mtu_default -> cxt1e1_max_mtu_default max_txdesc_used -> cxt1e1_max_txdesc_used max_txdesc_default -> cxt1e1_max_txdesc_default max_rxdesc_used -> cxt1e1_max_rxdesc_used max_rxdesc_default -> cxt1e1_max_rxdesc_default Since max_txdesc_used, max_rxdesc_used are module parameters, these were changed from global to static and the module init function assigns the values to the newly named global variables Signed-off-by: Jeff Oczek --- drivers/staging/cxt1e1/hwprobe.c | 7 ++--- drivers/staging/cxt1e1/linux.c | 53 +- drivers/staging/cxt1e1/musycc.c| 4 +-- drivers/staging/cxt1e1/pmcc4_drv.c | 22 +--- drivers/staging/cxt1e1/sbeproc.c | 6 ++--- 5 files changed, 51 insertions(+), 41 deletions(-) diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c index 4fa27c8..9eb0313 100644 --- a/drivers/staging/cxt1e1/hwprobe.c +++ b/drivers/staging/cxt1e1/hwprobe.c @@ -31,7 +31,7 @@ #include "sbeproc.h" #endif -extern int error_flag; +extern int cxt1e1_error_flag; extern int drvr_state; /* forward references */ @@ -294,7 +294,7 @@ c4hw_attach_all(void) struct pci_dev *pdev = NULL; int found = 0, i, j; - error_flag = 0; + cxt1e1_error_flag = 0; prep_hdw_info(); /*** scan PCI bus for all possible boards */ while ((pdev = pci_get_device(PCI_VENDOR_ID_CONEXANT, @@ -372,7 +372,8 @@ c4hw_attach_all(void) #if 0 cleanup_devs(); #endif - return error_flag; /* error_flag set w/in add_dev() */ + /* cxt1e1_error_flag set w/in add_dev() */ + return cxt1e1_error_flag; } show_two(hi, i); /* displays found information */ } diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index 09f3d5c..07cc142 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c @@ -83,7 +83,7 @@ int musycc_start_xmit(ci_t *, int, void *); extern ci_t *CI; extern struct s_hdw_info hdw_info[]; -int error_flag; /* module load error reporting */ +int cxt1e1_error_flag; /* module load error reporting */ int cxt1e1_log_level = LOG_ERROR; static int log_level_default = LOG_ERROR; module_param(cxt1e1_log_level, int, 0444); @@ -93,15 +93,17 @@ static int max_mru_default = MUSYCC_MRU; module_param(cxt1e1_max_mru, int, 0444); int cxt1e1_max_mtu = MUSYCC_MTU; -int max_mtu_default = MUSYCC_MTU; +int cxt1e1_max_mtu_default = MUSYCC_MTU; module_param(cxt1e1_max_mtu, int, 0444); -int max_txdesc_used = MUSYCC_TXDESC_MIN; -int max_txdesc_default = MUSYCC_TXDESC_MIN; +static int max_txdesc_used = MUSYCC_TXDESC_MIN; +int cxt1e1_max_txdesc_default = MUSYCC_TXDESC_MIN; +intcxt1e1_max_txdesc_used = MUSYCC_TXDESC_MIN; module_param(max_txdesc_used, int, 0444); -int max_rxdesc_used = MUSYCC_RXDESC_MIN; -int max_rxdesc_default = MUSYCC_RXDESC_MIN; +static int max_rxdesc_used = MUSYCC_RXDESC_MIN; +int cxt1e1_max_rxdesc_default = MUSYCC_RXDESC_MIN; +intcxt1e1_max_rxdesc_used = MUSYCC_RXDESC_MIN; module_param(max_rxdesc_used, int, 0444); // @@ -921,7 +923,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, if (!ndev) { pr_warning("%s: no memory for struct net_device !\n", hi->devname); - error_flag = -ENOMEM; + cxt1e1_error_flag = -ENOMEM; return NULL; } ci = (ci_t *)(netdev_priv(ndev)); @@ -956,7 +958,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, (c4_init(ci, (u_char *) f0, (u_char *) f1) != SBE_DRVR_SUCCESS)) { kfree(netdev_priv(ndev)); kfree(ndev); - error_flag = -ENODEV; + cxt1e1_error_flag = -ENODEV; return NULL; } /* @@ -982,7 +984,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, unregister_netdev(ndev); kfree(netdev_priv(ndev)); kfree(ndev); - error_flag = -EIO; + cxt1e1_error_flag = -EIO; return NULL; } #ifdef CONFIG_SBE_PMCC4_NCOMM @@ -992,7 +994,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, free_irq(irq0, ndev); kfree(netdev_priv(ndev)); kfree(ndev); - error_flag = -EIO; + cxt1e1_error_flag = -EIO;
[PATCH v2 1/2] staging: cxt1e1: Prefix ambiguous variable names with 'cxt1e1_' for clarity
Changed names of ambiguous sounding variable names as follows error_flag - cxt1e1_error_flag max_mtu_default - cxt1e1_max_mtu_default max_txdesc_used - cxt1e1_max_txdesc_used max_txdesc_default - cxt1e1_max_txdesc_default max_rxdesc_used - cxt1e1_max_rxdesc_used max_rxdesc_default - cxt1e1_max_rxdesc_default Since max_txdesc_used, max_rxdesc_used are module parameters, these were changed from global to static and the module init function assigns the values to the newly named global variables Signed-off-by: Jeff Oczek jeffoc...@gmail.com --- drivers/staging/cxt1e1/hwprobe.c | 7 ++--- drivers/staging/cxt1e1/linux.c | 53 +- drivers/staging/cxt1e1/musycc.c| 4 +-- drivers/staging/cxt1e1/pmcc4_drv.c | 22 +--- drivers/staging/cxt1e1/sbeproc.c | 6 ++--- 5 files changed, 51 insertions(+), 41 deletions(-) diff --git a/drivers/staging/cxt1e1/hwprobe.c b/drivers/staging/cxt1e1/hwprobe.c index 4fa27c8..9eb0313 100644 --- a/drivers/staging/cxt1e1/hwprobe.c +++ b/drivers/staging/cxt1e1/hwprobe.c @@ -31,7 +31,7 @@ #include sbeproc.h #endif -extern int error_flag; +extern int cxt1e1_error_flag; extern int drvr_state; /* forward references */ @@ -294,7 +294,7 @@ c4hw_attach_all(void) struct pci_dev *pdev = NULL; int found = 0, i, j; - error_flag = 0; + cxt1e1_error_flag = 0; prep_hdw_info(); /*** scan PCI bus for all possible boards */ while ((pdev = pci_get_device(PCI_VENDOR_ID_CONEXANT, @@ -372,7 +372,8 @@ c4hw_attach_all(void) #if 0 cleanup_devs(); #endif - return error_flag; /* error_flag set w/in add_dev() */ + /* cxt1e1_error_flag set w/in add_dev() */ + return cxt1e1_error_flag; } show_two(hi, i); /* displays found information */ } diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index 09f3d5c..07cc142 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c @@ -83,7 +83,7 @@ int musycc_start_xmit(ci_t *, int, void *); extern ci_t *CI; extern struct s_hdw_info hdw_info[]; -int error_flag; /* module load error reporting */ +int cxt1e1_error_flag; /* module load error reporting */ int cxt1e1_log_level = LOG_ERROR; static int log_level_default = LOG_ERROR; module_param(cxt1e1_log_level, int, 0444); @@ -93,15 +93,17 @@ static int max_mru_default = MUSYCC_MRU; module_param(cxt1e1_max_mru, int, 0444); int cxt1e1_max_mtu = MUSYCC_MTU; -int max_mtu_default = MUSYCC_MTU; +int cxt1e1_max_mtu_default = MUSYCC_MTU; module_param(cxt1e1_max_mtu, int, 0444); -int max_txdesc_used = MUSYCC_TXDESC_MIN; -int max_txdesc_default = MUSYCC_TXDESC_MIN; +static int max_txdesc_used = MUSYCC_TXDESC_MIN; +int cxt1e1_max_txdesc_default = MUSYCC_TXDESC_MIN; +intcxt1e1_max_txdesc_used = MUSYCC_TXDESC_MIN; module_param(max_txdesc_used, int, 0444); -int max_rxdesc_used = MUSYCC_RXDESC_MIN; -int max_rxdesc_default = MUSYCC_RXDESC_MIN; +static int max_rxdesc_used = MUSYCC_RXDESC_MIN; +int cxt1e1_max_rxdesc_default = MUSYCC_RXDESC_MIN; +intcxt1e1_max_rxdesc_used = MUSYCC_RXDESC_MIN; module_param(max_rxdesc_used, int, 0444); // @@ -921,7 +923,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, if (!ndev) { pr_warning(%s: no memory for struct net_device !\n, hi-devname); - error_flag = -ENOMEM; + cxt1e1_error_flag = -ENOMEM; return NULL; } ci = (ci_t *)(netdev_priv(ndev)); @@ -956,7 +958,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, (c4_init(ci, (u_char *) f0, (u_char *) f1) != SBE_DRVR_SUCCESS)) { kfree(netdev_priv(ndev)); kfree(ndev); - error_flag = -ENODEV; + cxt1e1_error_flag = -ENODEV; return NULL; } /* @@ -982,7 +984,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, unregister_netdev(ndev); kfree(netdev_priv(ndev)); kfree(ndev); - error_flag = -EIO; + cxt1e1_error_flag = -EIO; return NULL; } #ifdef CONFIG_SBE_PMCC4_NCOMM @@ -992,7 +994,7 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1, free_irq(irq0, ndev); kfree(netdev_priv(ndev)); kfree(ndev); - error_flag = -EIO; + cxt1e1_error_flag = -EIO;