Re: [PATCH v4] video: hyperv: hyperv_fb: refresh the VM screen by force on VM panic
On 01/08/14 14:27, Dexuan Cui wrote: > Currently the VSC has no chance to notify the VSP of the dirty rectangle on VM > panic because the notification work is done in a workqueue, and in panic() the > kernel typically ends up in an infinite loop, and a typical kernel config has > CONFIG_PREEMPT_VOLUNTARY=y and CONFIG_PREEMPT is not set, so a context switch > can't happen in panic() and the workqueue won't have a chance to run. As a > result, the VM Connection window can't refresh until it's closed and we > re-connect to the VM. > > We can register a handler on panic_notifier_list: the handler can notify > the VSC and switch the framebuffer driver to a "synchronous mode", meaning > the VSC flushes any future framebuffer change to the VSP immediately. > > v2: removed the MS-TFS line in the commit message > v3: remove some 'unlikely' markings > v4: avoid global variables as Tomi Valkeinen suggested > > Cc: Haiyang Zhang > Signed-off-by: Dexuan Cui > --- > drivers/video/fbdev/hyperv_fb.c | 62 > +++-- > 1 file changed, 59 insertions(+), 3 deletions(-) Thanks, looks fine to me. Queuing for 3.17. Tomi signature.asc Description: OpenPGP digital signature ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re:Cash Alert...
Your email has won you ( £500,000.00 Pounds ) in the Heritage give away promo, to confirm you are not a robot answer the below question who is the current president of United States Of America (A)Hillary Clinton, (B)Barack Obama, (C)Bill Gate,send the correct answer to wu.transfe...@qq.com, Claims will be made via Western Union ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH v5 3/4] Staging: rts5208: Use dev_dbg and %*phspecifiertodump memory
On 08/02/2014 01:55 AM, Fabio Falzoi wrote: On Wed, Jul 30, 2014 at 09:52:35AM +0800, micky wrote: Documentation/printk-formats.txt Raw buffer as a hex string: %*ph00 01 02 ... 3f %*phC 00:01:02: ... :3f %*phD 00-01-02- ... -3f %*phN 000102 ... 3f For printing a small buffers (up to 64 bytes long) as a hex string with certain separator. For the larger buffers consider to use print_hex_dump(). Since we can't make sure the cnt value, it is not good use "%*ph", because it must make cnt <= 64. dw_len * 4 <= 64 ? Hi Micky, I think that in these two cases we can rely on print_hex_dump_bytes that doesn't have the dev_dbg limit on buffer size. Let me know what you think about it. If you agree, I can send a new version for patches 3/4 and 4/4, since the first two have already been merged in the linux-next tree by Greg. Hi Fabio, I think it is good, Thanks. Best Regards, micky Regards, Fabio . ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/1] cris: fix %d confusingly prefixed with 0x in format string
On Sun, 2014-08-03 at 17:25 -0700, Hans Wennborg wrote:
> On 08/02/2014 11:10 PM, Joe Perches wrote:
> > On Sat, 2014-08-02 at 18:19 -0700, Hans Wennborg wrote:
> >> Yes, I have a patch for a bunch of these, but I figured it would be
> >> easier to get it merged if I split it up. (Complete kernel newbie here.)
> >
> > You as a kernel newbie did good, thanks.
> >
> > A small tip would be to do all of them in a single series
> > cc'ing each individual patch to the appropriate maintainers
> > and mailing lists.
>
> Thanks for the advice! I have split up and sent out the big patch as a
> series, with hopefully the right folks CC'd.
Another nice thing to do is to use git format-patch --cover-letter
so that you can use a [PATCH 0/n] introductory description too.
Other than that, nice job, thanks.
Perhaps now you can do the "0x%u" variants.
$ /usr/bin/git grep -P
'0x\%(?!ullx\b|ullX\b|llux\b|lux\b|ulx\b|ulX\b|lx\b|lluX\b|luX\b|lX\b)[ul]*[u]'
drivers/iommu/arm-smmu.c: "Unexpected context
fault (fsr 0x%u)\n",
drivers/net/vmxnet3/vmxnet3_drv.c: "txd[%u]:
0x%llu %u %u\n",
drivers/net/wireless/mwifiex/cfg80211.c:wiphy_dbg(wiphy, "info:
ongoing ROC, cookie = 0x%llu\n",
drivers/pinctrl/pinctrl-at91.c: dev_dbg(dev, "pio%c%d configured as
periph%c with conf = 0x%lu\n",
drivers/pinctrl/pinctrl-at91.c: dev_dbg(dev, "pio%c%d configured as
gpio with conf = 0x%lu\n",
drivers/scsi/cxgbi/libcxgbi.c: "csk 0x%p,%u,0x%lu,%u, seq %u, wup %u,
thre %u, %u.\n",
drivers/scsi/qla2xxx/qla_target.c: "dif check TGT cdb 0x%x lba 0x%llu:
[Actual|Expected] Ref Tag[0x%x|0x%x], App Tag [0x%x|0x%x], Guard [0x%x|0x%x]\n",
drivers/usb/musb/ux500_dma.c: "packet_sz=%d, mode=%d,
dma_addr=0x%llu, len=%d is_tx=%d\n",
fs/exofs/dir.c: "offset=%lu, inode=0x%llu, rec_len=%d, name_len=%d\n",
fs/xfs/xfs_discard.c:"discard failed for extent [0x%llu,%u], error %d",
sound/soc/atmel/atmel_ssc_dai.c:pr_debug("atmel_ssc_startup:
SSC_SR=0x%u\n",
There are some more with specific format lengths too:
arch/sparc/kernel/smp_32.c: printk(KERN_NOTICE "No MID found for
CPU%d at node 0x%08d", id, cpu_node);
drivers/mfd/rtsx_usb.c: dev_dbg(&intf->dev, "%s called with pm message
0x%04u\n",
drivers/net/wireless/rtlwifi/rtl8192de/fw.c: "Polling FW ready
fail!! REG_MCUFWDL:0x%08ul\n",
drivers/tty/moxa.c: printk(KERN_INFO "MOXA isa board found
at 0x%.8lu and "
cheers, Joe
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 1/1] cris: fix %d confusingly prefixed with 0x in format string
On 08/02/2014 11:10 PM, Joe Perches wrote: On Sat, 2014-08-02 at 18:19 -0700, Hans Wennborg wrote: Yes, I have a patch for a bunch of these, but I figured it would be easier to get it merged if I split it up. (Complete kernel newbie here.) You as a kernel newbie did good, thanks. A small tip would be to do all of them in a single series cc'ing each individual patch to the appropriate maintainers and mailing lists. Thanks for the advice! I have split up and sent out the big patch as a series, with hopefully the right folks CC'd. - Hans ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 17/19] staging: rtl8821ae: fix %d confusingly prefixed with 0x in format strings
Signed-off-by: Hans Wennborg
---
drivers/staging/rtl8821ae/pci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8821ae/pci.c b/drivers/staging/rtl8821ae/pci.c
index 26d7b2f..b818788 100644
--- a/drivers/staging/rtl8821ae/pci.c
+++ b/drivers/staging/rtl8821ae/pci.c
@@ -662,7 +662,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int
prio)
RT_TRACE(COMP_ERR, DBG_LOUD,
("more desc left, wake"
"skb_queue@%d,ring->idx = %d,"
-"skb_queue_len = 0x%d\n",
+"skb_queue_len = 0x%x\n",
prio, ring->idx,
skb_queue_len(&ring->queue)));
@@ -1650,7 +1650,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
RT_TRACE(COMP_ERR, DBG_WARNING,
("No more TX desc@%d, ring->idx = %d,"
- "idx = %d, skb_queue_len = 0x%d\n",
+ "idx = %d, skb_queue_len = 0x%x\n",
hw_queue, ring->idx, idx,
skb_queue_len(&ring->queue)));
@@ -1695,7 +1695,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
RT_TRACE(COMP_ERR, DBG_LOUD,
("less desc left, stop skb_queue@%d, "
"ring->idx = %d,"
- "idx = %d, skb_queue_len = 0x%d\n",
+ "idx = %d, skb_queue_len = 0x%x\n",
hw_queue, ring->idx, idx,
skb_queue_len(&ring->queue)));
--
2.0.0.526.g5318336
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 16/19] staging: rtl8192ee: fix %d confusingly prefixed with 0x in format strings
Signed-off-by: Hans Wennborg
---
drivers/staging/rtl8192ee/pci.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8192ee/pci.c b/drivers/staging/rtl8192ee/pci.c
index 0215aef..349e636 100644
--- a/drivers/staging/rtl8192ee/pci.c
+++ b/drivers/staging/rtl8192ee/pci.c
@@ -649,7 +649,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int
prio)
if ((ring->entries - skb_queue_len(&ring->queue)) == 2) {
RT_TRACE(COMP_ERR, DBG_LOUD,
-("more desc left, wake skb_queue@%d,ring->idx
= %d, skb_queue_len = 0x%d\n",
+("more desc left, wake skb_queue@%d,ring->idx
= %d, skb_queue_len = 0x%x\n",
prio, ring->idx,
skb_queue_len(&ring->queue)));
@@ -1628,7 +1628,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
RT_TRACE(COMP_ERR, DBG_WARNING,
-("No more TX desc@%d, ring->idx = %d, idx =
%d, skb_queue_len = 0x%d\n",
+("No more TX desc@%d, ring->idx = %d, idx =
%d, skb_queue_len = 0x%x\n",
hw_queue, ring->idx, idx,
skb_queue_len(&ring->queue)));
@@ -1670,7 +1670,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
hw_queue != BEACON_QUEUE) {
RT_TRACE(COMP_ERR, DBG_LOUD,
-("less desc left, stop skb_queue@%d, ring->idx = %d,
idx = %d, skb_queue_len = 0x%d\n",
+("less desc left, stop skb_queue@%d, ring->idx = %d,
idx = %d, skb_queue_len = 0x%x\n",
hw_queue, ring->idx, idx,
skb_queue_len(&ring->queue)));
--
2.0.0.526.g5318336
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 15/19] staging: nokia_h4p: fix %d confusingly prefixed with 0x in format string
Signed-off-by: Hans Wennborg
---
drivers/staging/nokia_h4p/nokia_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/nokia_h4p/nokia_core.c
b/drivers/staging/nokia_h4p/nokia_core.c
index 775e1d0..240da0c 100644
--- a/drivers/staging/nokia_h4p/nokia_core.c
+++ b/drivers/staging/nokia_h4p/nokia_core.c
@@ -1113,7 +1113,7 @@ static int hci_h4p_probe(struct platform_device *pdev)
GPIOF_OUT_INIT_LOW, "bt_wakeup");
if (err < 0) {
- dev_err(info->dev, "Cannot get GPIO line 0x%d",
+ dev_err(info->dev, "Cannot get GPIO line 0x%x",
info->bt_wakeup_gpio);
return err;
}
--
2.0.0.526.g5318336
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: lustre: use NULL instead of 0 for non-integers
This fixes sparse errors where 0 is used for non-integers.
Signed-off-by: Martin Kepplinger
---
applies to -next20140802
drivers/staging/lustre/lnet/lnet/api-ni.c |4 +-
drivers/staging/lustre/lustre/fld/fld_request.c|2 +-
drivers/staging/lustre/lustre/llite/llite_lib.c|2 +-
drivers/staging/lustre/lustre/llite/lproc_llite.c |2 +-
drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 44 ++--
drivers/staging/lustre/lustre/mgc/mgc_request.c|2 +-
.../lustre/lustre/obdclass/linux/linux-module.c|2 +-
drivers/staging/lustre/lustre/obdclass/llog_test.c |4 +-
.../staging/lustre/lustre/obdclass/obd_config.c|4 +-
.../staging/lustre/lustre/obdecho/echo_client.c|2 +-
drivers/staging/lustre/lustre/osc/osc_request.c|6 +--
11 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c
b/drivers/staging/lustre/lnet/lnet/api-ni.c
index f4a2c65..b28734a 100644
--- a/drivers/staging/lustre/lnet/lnet/api-ni.c
+++ b/drivers/staging/lustre/lnet/lnet/api-ni.c
@@ -1662,7 +1662,7 @@ lnet_destroy_ping_info(void)
int
lnet_ping_target_init(void)
{
- lnet_md_tmd = {0};
+ lnet_md_tmd = { NULL };
lnet_handle_me_t meh;
lnet_process_id_t id;
intrc;
@@ -1770,7 +1770,7 @@ lnet_ping (lnet_process_id_t id, int timeout_ms,
lnet_process_id_t *ids, int n_i
lnet_handle_eq_t eqh;
lnet_handle_md_t mdh;
lnet_event_t event;
- lnet_md_t md = {0};
+ lnet_md_t md = { NULL };
int which;
int unlinked = 0;
int replied = 0;
diff --git a/drivers/staging/lustre/lustre/fld/fld_request.c
b/drivers/staging/lustre/lustre/fld/fld_request.c
index 4efded9..8e512f9 100644
--- a/drivers/staging/lustre/lustre/fld/fld_request.c
+++ b/drivers/staging/lustre/lustre/fld/fld_request.c
@@ -168,7 +168,7 @@ struct lu_fld_hash fld_hash[] = {
.fh_scan_func = fld_rrb_scan
},
{
- 0,
+ NULL,
}
};
diff --git a/drivers/staging/lustre/lustre/llite/llite_lib.c
b/drivers/staging/lustre/lustre/llite/llite_lib.c
index e0d8f15..0367f5a 100644
--- a/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@ -152,7 +152,7 @@ static void ll_free_sbi(struct super_block *sb)
static int client_common_fill_super(struct super_block *sb, char *md, char *dt,
struct vfsmount *mnt)
{
- struct inode *root = 0;
+ struct inode *root = NULL;
struct ll_sb_info *sbi = ll_s2sbi(sb);
struct obd_device *obd;
struct obd_capa *oc = NULL;
diff --git a/drivers/staging/lustre/lustre/llite/lproc_llite.c
b/drivers/staging/lustre/lustre/llite/lproc_llite.c
index 13586c5..77f68b5 100644
--- a/drivers/staging/lustre/lustre/llite/lproc_llite.c
+++ b/drivers/staging/lustre/lustre/llite/lproc_llite.c
@@ -843,7 +843,7 @@ static struct lprocfs_vars lprocfs_llite_obd_vars[] = {
{ "default_cookiesize", &ll_defult_cookiesize_fops, NULL, 0 },
{ "sbi_flags",&ll_sbi_flags_fops, NULL, 0 },
{ "xattr_cache", &ll_xattr_cache_fops, NULL, 0 },
- { 0 }
+ { NULL }
};
#define MAX_STRING_SIZE 128
diff --git a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
index e6af825..f266e95 100644
--- a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
+++ b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
@@ -172,39 +172,39 @@ LPROC_SEQ_FOPS_RW_TYPE(mdc, import);
LPROC_SEQ_FOPS_RW_TYPE(mdc, pinger_recov);
static struct lprocfs_vars lprocfs_mdc_obd_vars[] = {
- { "uuid", &mdc_uuid_fops, 0, 0 },
- { "ping", &mdc_ping_fops, 0, 0222 },
- { "connect_flags", &mdc_connect_flags_fops,0, 0 },
- { "blocksize", &mdc_blksize_fops, 0, 0 },
- { "kbytestotal",&mdc_kbytestotal_fops, 0, 0 },
- { "kbytesfree", &mdc_kbytesfree_fops, 0, 0 },
- { "kbytesavail",&mdc_kbytesavail_fops, 0, 0 },
- { "filestotal", &mdc_filestotal_fops, 0, 0 },
- { "filesfree", &mdc_filesfree_fops,0, 0 },
- /*{ "filegroups", lprocfs_rd_filegroups, 0, 0 },*/
- { "mds_server_uuid", &mdc_server_uuid_fops, 0, 0 },
- { "mds_conn_uuid", &mdc_conn_uuid_fops,0, 0 },
+ { "uuid", &mdc_uuid_fops, NULL, 0 },
+ { "ping", &mdc_ping_fops, NULL, 0222 },
+ { "connect_flags", &mdc_connect_flags_fops,NULL, 0 },
+ { "blocksize", &mdc_blksize_fops, NULL, 0 },
+ { "kbytestotal",&mdc_kbytestotal_fops, NULL, 0 },
+ { "kbytesfree", &mdc_kbytesfree_fops, NULL, 0 },
+
[PATCH] Staging: lustre: checkpatch: remove blank spaces
Remove spaces between the function names and open paranthesis and use the
kernel coding style.
Signed-off-by: Tom Wales
---
drivers/staging/lustre/lustre/obdclass/llog_swab.c | 52 +++---
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/drivers/staging/lustre/lustre/obdclass/llog_swab.c
b/drivers/staging/lustre/lustre/obdclass/llog_swab.c
index b3247fb..bfac838 100644
--- a/drivers/staging/lustre/lustre/obdclass/llog_swab.c
+++ b/drivers/staging/lustre/lustre/obdclass/llog_swab.c
@@ -61,9 +61,9 @@ static void print_llogd_body(struct llogd_body *d)
void lustre_swab_lu_fid(struct lu_fid *fid)
{
- __swab64s (&fid->f_seq);
- __swab32s (&fid->f_oid);
- __swab32s (&fid->f_ver);
+ __swab64s(&fid->f_seq);
+ __swab32s(&fid->f_oid);
+ __swab32s(&fid->f_ver);
}
EXPORT_SYMBOL(lustre_swab_lu_fid);
@@ -82,47 +82,47 @@ void lustre_swab_llog_id(struct llog_logid *log_id)
{
__swab64s(&log_id->lgl_oi.oi.oi_id);
__swab64s(&log_id->lgl_oi.oi.oi_seq);
-__swab32s(&log_id->lgl_ogen);
+ __swab32s(&log_id->lgl_ogen);
}
EXPORT_SYMBOL(lustre_swab_llog_id);
-void lustre_swab_llogd_body (struct llogd_body *d)
+void lustre_swab_llogd_body(struct llogd_body *d)
{
print_llogd_body(d);
lustre_swab_llog_id(&d->lgd_logid);
- __swab32s (&d->lgd_ctxt_idx);
- __swab32s (&d->lgd_llh_flags);
- __swab32s (&d->lgd_index);
- __swab32s (&d->lgd_saved_index);
- __swab32s (&d->lgd_len);
- __swab64s (&d->lgd_cur_offset);
+ __swab32s(&d->lgd_ctxt_idx);
+ __swab32s(&d->lgd_llh_flags);
+ __swab32s(&d->lgd_index);
+ __swab32s(&d->lgd_saved_index);
+ __swab32s(&d->lgd_len);
+ __swab64s(&d->lgd_cur_offset);
print_llogd_body(d);
}
EXPORT_SYMBOL(lustre_swab_llogd_body);
-void lustre_swab_llogd_conn_body (struct llogd_conn_body *d)
+void lustre_swab_llogd_conn_body(struct llogd_conn_body *d)
{
- __swab64s (&d->lgdc_gen.mnt_cnt);
- __swab64s (&d->lgdc_gen.conn_cnt);
+ __swab64s(&d->lgdc_gen.mnt_cnt);
+ __swab64s(&d->lgdc_gen.conn_cnt);
lustre_swab_llog_id(&d->lgdc_logid);
- __swab32s (&d->lgdc_ctxt_idx);
+ __swab32s(&d->lgdc_ctxt_idx);
}
EXPORT_SYMBOL(lustre_swab_llogd_conn_body);
void lustre_swab_ll_fid(struct ll_fid *fid)
{
- __swab64s (&fid->id);
- __swab32s (&fid->generation);
- __swab32s (&fid->f_type);
+ __swab64s(&fid->id);
+ __swab32s(&fid->generation);
+ __swab32s(&fid->f_type);
}
EXPORT_SYMBOL(lustre_swab_ll_fid);
void lustre_swab_lu_seq_range(struct lu_seq_range *range)
{
- __swab64s (&range->lsr_start);
- __swab64s (&range->lsr_end);
- __swab32s (&range->lsr_index);
- __swab32s (&range->lsr_flags);
+ __swab64s(&range->lsr_start);
+ __swab64s(&range->lsr_end);
+ __swab32s(&range->lsr_index);
+ __swab32s(&range->lsr_flags);
}
EXPORT_SYMBOL(lustre_swab_lu_seq_range);
@@ -168,7 +168,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
}
case CHANGELOG_REC:
{
- struct llog_changelog_rec *cr = (struct llog_changelog_rec*)rec;
+ struct llog_changelog_rec *cr = (struct llog_changelog_rec
*)rec;
__swab16s(&cr->cr.cr_namelen);
__swab16s(&cr->cr.cr_flags);
@@ -193,7 +193,7 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec)
case CHANGELOG_USER_REC:
{
struct llog_changelog_user_rec *cur =
- (struct llog_changelog_user_rec*)rec;
+ (struct llog_changelog_user_rec *)rec;
__swab32s(&cur->cur_id);
__swab64s(&cur->cur_endrec);
@@ -294,7 +294,7 @@ static void print_llog_hdr(struct llog_log_hdr *h)
CDEBUG(D_OTHER, "\tllh_tail.lrt_len: %#x\n", h->llh_tail.lrt_len);
}
-void lustre_swab_llog_hdr (struct llog_log_hdr *h)
+void lustre_swab_llog_hdr(struct llog_log_hdr *h)
{
print_llog_hdr(h);
@@ -367,7 +367,7 @@ struct cfg_marker32 {
void lustre_swab_cfg_marker(struct cfg_marker *marker, int swab, int size)
{
- struct cfg_marker32 *cm32 = (struct cfg_marker32*)marker;
+ struct cfg_marker32 *cm32 = (struct cfg_marker32 *)marker;
if (swab) {
__swab32s(&marker->cm_step);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8192u: checkpatch: do not use C99 // comments
Use the common kernel coding style, so don't use C99 // comments.
If too long, where reasonable, they are shortened as well.
Some old internal comments about date and author of changes are
removed.
This provides a more consistent view and hopefully encourages to
look at it.
Signed-off-by: Martin Kepplinger
---
This changes only a part of rtl8192u's comments. When this is desired,
one can go about and change the rest of the driver.
build-tested. applies to -next20140801
drivers/staging/rtl8192u/r8180_93cx6.c | 12 +-
drivers/staging/rtl8192u/r8192U_core.c | 757 +---
2 files changed, 414 insertions(+), 355 deletions(-)
diff --git a/drivers/staging/rtl8192u/r8180_93cx6.c
b/drivers/staging/rtl8192u/r8180_93cx6.c
index fb8a7a8..9f3f9dd 100644
--- a/drivers/staging/rtl8192u/r8180_93cx6.c
+++ b/drivers/staging/rtl8192u/r8180_93cx6.c
@@ -103,7 +103,7 @@ u32 eprom_read(struct net_device *dev, u32 addr)
u32 ret;
ret = 0;
- //enable EPROM programming
+ /* enable EPROM programming */
write_nic_byte_E(dev, EPROM_CMD,
(EPROM_CMD_PROGRAM<
#include
#include
-// FIXME: check if 2.6.7 is ok
+/* FIXME: check if 2.6.7 is ok */
#include "dot11d.h"
-//set here to open your trace code. //WB
+/* set here to open your trace code. */
u32 rt_global_debug_component = COMP_DOWN |
COMP_SEC|
- COMP_ERR; //always open err flags on
+ COMP_ERR; /* always open err flags on */
#define TOTAL_CAM_ENTRY 32
#define CAM_CONTENT_COUNT 8
@@ -132,7 +132,7 @@ MODULE_DEVICE_TABLE(usb, rtl8192_usb_id_tbl);
MODULE_DESCRIPTION("Linux driver for Realtek RTL8192 USB WiFi cards");
static char *ifname = "wlan%d";
-static int hwwep = 1; //default use hw. set 0 to use software security
+static int hwwep = 1; /* default use hw. set 0 to use software security */
static int channels = 0x3fff;
@@ -166,17 +166,17 @@ typedef struct _CHANNEL_LIST {
} CHANNEL_LIST, *PCHANNEL_LIST;
static CHANNEL_LIST ChannelPlan[] = {
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 36, 40, 44, 48, 52, 56, 60, 64,
149, 153, 157, 161, 165}, 24}, //FCC
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11},
//IC
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56,
60, 64}, 21}, //ETSI
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13},//Spain. Change
to ETSI.
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, //France.
Change to ETSI.
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22}, //MKK //MKK
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22},//MKK1
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, //Israel.
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22}, // For 11a , TELEC
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22},//MIC
- {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, 14}
//For Global Domain. 1-11:active scan, 12-14 passive scan.
//+YJ, 080626
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 36, 40, 44, 48, 52, 56, 60, 64,
149, 153, 157, 161, 165}, 24}, /* FCC */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 11},
/* IC */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 36, 40, 44, 48, 52, 56,
60, 64}, 21}, /* ETSI */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* Spain.
Change to ETSI. */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* France.
Change to ETSI. */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22}, /* MKK */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22}, /* MKK1 */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13}, 13}, /* Israel. */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22}, /* For 11a , TELEC */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 36, 40, 44, 48, 52,
56, 60, 64}, 22}, /* MIC */
+ {{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, 14} /* For Global
Domain. 1-11:active scan, 12-14 passive scan.*/
};
static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv)
@@ -196,7 +196,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct
r8192_priv *priv)
case COUNTRY_CODE_MIC:
Dot11d_Init(ieee);
ieee->bGlobalDomain = false;
- //actually 8225 & 8256 rf chips only support B,G,24N mode
+ /* actually 8225 & 8256 rf chips only support B,G,24N mode */
[PATCH 37/44] Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp"
Renamed variable "uiTempVar" -> "tmp" in
bcm_char_ioctl_eeprom_reg_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 7e2b1d1..934b19a 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -415,7 +415,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
{
struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer io_buff;
- UINT uiTempVar = 0;
+ UINT tmp = 0;
INT Status;
if ((ad->IdleMode == TRUE) ||
@@ -448,12 +448,12 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
return -EINVAL;
}
- uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
+ tmp = wrm_buff.Register & EEPROM_REJECT_MASK;
if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
- ((uiTempVar == EEPROM_REJECT_REG_1) ||
- (uiTempVar == EEPROM_REJECT_REG_2) ||
- (uiTempVar == EEPROM_REJECT_REG_3) ||
- (uiTempVar == EEPROM_REJECT_REG_4)) &&
+ ((tmp == EEPROM_REJECT_REG_1) ||
+ (tmp == EEPROM_REJECT_REG_2) ||
+ (tmp == EEPROM_REJECT_REG_3) ||
+ (tmp == EEPROM_REJECT_REG_4)) &&
(cmd == IOCTL_BCM_REGISTER_WRITE)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 43/44] Staging: bcm: Bcmchar.c: Renamed variable "uiOperation" -> "operation"
Renamed variable "uiOperation" -> "operation" in bcm_char_ioctl_gpio_set_request(). Signed-off-by: Matthias Beyer --- drivers/staging/bcm/Bcmchar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 291e966..32b767f 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -484,7 +484,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user *argp, UCHAR reset_val[4]; UINT value = 0; UINT bit = 0; - UINT uiOperation = 0; + UINT operation = 0; INT Status; int bytes; @@ -509,7 +509,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user *argp, return -EFAULT; bit = gpio_info.uiGpioNumber; - uiOperation = gpio_info.uiGpioValue; + operation = gpio_info.uiGpioValue; value = (1
[PATCH 21/44] Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff"
Renamed variable "IoBuffer" -> "io_buff" in
bcm_char_ioctl_reg_read_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index d69b139..a85437e 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -247,7 +247,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
struct bcm_mini_adapter *ad)
{
struct bcm_rdm_buffer rdm_buff = {0};
- struct bcm_ioctl_buffer IoBuffer;
+ struct bcm_ioctl_buffer io_buff;
PCHAR temp_buff;
INT Status = STATUS_FAILURE;
UINT Bufflen;
@@ -255,22 +255,22 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
int bytes;
/* Copy Ioctl Buffer structure */
- if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+ if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(rdm_buff))
+ if (io_buff.InputLength > sizeof(rdm_buff))
return -EINVAL;
- if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer,
- IoBuffer.InputLength))
+ if (copy_from_user(&rdm_buff, io_buff.InputBuffer,
+ io_buff.InputLength))
return -EFAULT;
- if (IoBuffer.OutputLength > USHRT_MAX ||
- IoBuffer.OutputLength == 0) {
+ if (io_buff.OutputLength > USHRT_MAX ||
+ io_buff.OutputLength == 0) {
return -EINVAL;
}
- Bufflen = IoBuffer.OutputLength;
+ Bufflen = io_buff.OutputLength;
temp_value = 4 - (Bufflen % 4);
Bufflen += temp_value % 4;
@@ -282,7 +282,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
(PUINT)temp_buff, Bufflen);
if (bytes > 0) {
Status = STATUS_SUCCESS;
- if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
+ if (copy_to_user(io_buff.OutputBuffer, temp_buff, bytes)) {
kfree(temp_buff);
return -EFAULT;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 20/44] Staging: bcm: Bcmchar.c: Renamed variable "sRdmBuffer" -> "rdm_buff"
Renamed variable "sRdmBuffer" -> "rdm_buff" in
bcm_char_ioctl_reg_read_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 0511298..d69b139 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -246,7 +246,7 @@ static ssize_t bcm_char_read(struct file *filp,
static int bcm_char_ioctl_reg_read_private(void __user *argp,
struct bcm_mini_adapter *ad)
{
- struct bcm_rdm_buffer sRdmBuffer = {0};
+ struct bcm_rdm_buffer rdm_buff = {0};
struct bcm_ioctl_buffer IoBuffer;
PCHAR temp_buff;
INT Status = STATUS_FAILURE;
@@ -258,10 +258,10 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(sRdmBuffer))
+ if (IoBuffer.InputLength > sizeof(rdm_buff))
return -EINVAL;
- if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer,
+ if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer,
IoBuffer.InputLength))
return -EFAULT;
@@ -278,7 +278,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
if (!temp_buff)
return -ENOMEM;
- bytes = rdmalt(ad, (UINT)sRdmBuffer.Register,
+ bytes = rdmalt(ad, (UINT)rdm_buff.Register,
(PUINT)temp_buff, Bufflen);
if (bytes > 0) {
Status = STATUS_SUCCESS;
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 40/44] Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff"
Renamed variable "IoBuffer" -> "io_buff" in
bcm_char_ioctl_gpio_set_request().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index bfe1938..5b44eff 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -480,7 +480,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
struct bcm_mini_adapter *ad)
{
struct bcm_gpio_info gpio_info = {0};
- struct bcm_ioctl_buffer IoBuffer;
+ struct bcm_ioctl_buffer io_buff;
UCHAR ucResetValue[4];
UINT value = 0;
UINT uiBit = 0;
@@ -498,14 +498,14 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
return -EACCES;
}
- if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+ if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(gpio_info))
+ if (io_buff.InputLength > sizeof(gpio_info))
return -EINVAL;
- if (copy_from_user(&gpio_info, IoBuffer.InputBuffer,
- IoBuffer.InputLength))
+ if (copy_from_user(&gpio_info, io_buff.InputBuffer,
+ io_buff.InputLength))
return -EFAULT;
uiBit = gpio_info.uiGpioNumber;
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 41/44] Staging: bcm: Bcmchar.c: Renamed variable "ucResetValue" -> "reset_val"
Renamed variable "ucResetValue" -> "reset_val" in
bcm_char_ioctl_gpio_set_request().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 5b44eff..3908299 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -481,7 +481,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
{
struct bcm_gpio_info gpio_info = {0};
struct bcm_ioctl_buffer io_buff;
- UCHAR ucResetValue[4];
+ UCHAR reset_val[4];
UINT value = 0;
UINT uiBit = 0;
UINT uiOperation = 0;
@@ -558,7 +558,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
}
bytes = rdmaltWithLock(ad, (UINT)GPIO_MODE_REGISTER,
- (PUINT)ucResetValue, sizeof(UINT));
+ (PUINT)reset_val, sizeof(UINT));
if (bytes < 0) {
Status = bytes;
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
@@ -569,9 +569,9 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
}
/* Set the gpio mode register to output */
- *(UINT *)ucResetValue |= (1
[PATCH 42/44] Staging: bcm: Bcmchar.c: Renamed variable "uiBit" -> "bit"
Renamed variable "uiBit" -> "bit" in bcm_char_ioctl_gpio_set_request(). Signed-off-by: Matthias Beyer --- drivers/staging/bcm/Bcmchar.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 3908299..291e966 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -483,7 +483,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user *argp, struct bcm_ioctl_buffer io_buff; UCHAR reset_val[4]; UINT value = 0; - UINT uiBit = 0; + UINT bit = 0; UINT uiOperation = 0; INT Status; int bytes; @@ -508,9 +508,9 @@ static int bcm_char_ioctl_gpio_set_request(void __user *argp, io_buff.InputLength)) return -EFAULT; - uiBit = gpio_info.uiGpioNumber; + bit = gpio_info.uiGpioNumber; uiOperation = gpio_info.uiGpioValue; - value = (1
[PATCH 39/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in bcm_char_ioctl_gpio_set_request().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f3672ba..bfe1938 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -477,7 +477,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
}
static int bcm_char_ioctl_gpio_set_request(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *ad)
{
struct bcm_gpio_info gpio_info = {0};
struct bcm_ioctl_buffer IoBuffer;
@@ -488,11 +488,11 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
INT Status;
int bytes;
- if ((Adapter->IdleMode == TRUE) ||
- (Adapter->bShutStatus == TRUE) ||
- (Adapter->bPreparingForLowPowerMode == TRUE)) {
+ if ((ad->IdleMode == TRUE) ||
+ (ad->bShutStatus == TRUE) ||
+ (ad->bPreparingForLowPowerMode == TRUE)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL,
"GPIO Can't be set/clear in Low power Mode");
return -EACCES;
@@ -512,8 +512,8 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
uiOperation = gpio_info.uiGpioValue;
value = (1< is not correspond
to LED !!!",
value);
@@ -523,16 +523,16 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
/* Set - setting 1 */
if (uiOperation) {
/* Set the gpio output register */
- Status = wrmaltWithLock(Adapter,
+ Status = wrmaltWithLock(ad,
BCM_GPIO_OUTPUT_SET_REG,
(PUINT)(&value), sizeof(UINT));
if (Status == STATUS_SUCCESS) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
OSAL_DBG, DBG_LVL_ALL,
"Set the GPIO bit\n");
} else {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
OSAL_DBG, DBG_LVL_ALL,
"Failed to set the %dth GPIO\n",
uiBit);
@@ -540,16 +540,16 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
}
} else {
/* Set the gpio output register */
- Status = wrmaltWithLock(Adapter,
+ Status = wrmaltWithLock(ad,
BCM_GPIO_OUTPUT_CLR_REG,
(PUINT)(&value), sizeof(UINT));
if (Status == STATUS_SUCCESS) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
OSAL_DBG, DBG_LVL_ALL,
"Set the GPIO bit\n");
} else {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
OSAL_DBG, DBG_LVL_ALL,
"Failed to clear the %dth GPIO\n",
uiBit);
@@ -557,11 +557,11 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
}
}
- bytes = rdmaltWithLock(Adapter, (UINT)GPIO_MODE_REGISTER,
+ bytes = rdmaltWithLock(ad, (UINT)GPIO_MODE_REGISTER,
(PUINT)ucResetValue, sizeof(UINT));
if (bytes < 0) {
Status = bytes;
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"GPIO_MODE_REGISTER read failed");
return Status;
} else {
@@ -570,15 +570,15 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
/* Set the gpio mode register to output */
*(UINT *)ucResetValue |= (1
[PATCH 38/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in
bcm_char_ioctl_eeprom_reg_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 934b19a..f3672ba 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -416,7 +416,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer io_buff;
UINT tmp = 0;
- INT Status;
+ INT status;
if ((ad->IdleMode == TRUE) ||
(ad->bShutStatus == TRUE) ||
@@ -461,19 +461,19 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
return -EFAULT;
}
- Status = wrmaltWithLock(ad, (UINT)wrm_buff.Register,
+ status = wrmaltWithLock(ad, (UINT)wrm_buff.Register,
(PUINT)wrm_buff.Data,
wrm_buff.Length);
- if (Status == STATUS_SUCCESS) {
+ if (status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG,
DBG_LVL_ALL, "WRM Done\n");
} else {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, "WRM Failed\n");
- Status = -EFAULT;
+ status = -EFAULT;
}
- return Status;
+ return status;
}
static int bcm_char_ioctl_gpio_set_request(void __user *argp,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 32/44] Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp"
Renamed variable "uiTempVar" -> "tmp" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 5c6ae99..1f30cea 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -347,7 +347,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
struct bcm_rdm_buffer rdm_buff = {0};
struct bcm_ioctl_buffer io_buff;
PCHAR temp_buff = NULL;
- UINT uiTempVar = 0;
+ UINT tmp = 0;
INT Status;
int bytes;
@@ -391,7 +391,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
return -EINVAL;
}
- uiTempVar = rdm_buff.Register & EEPROM_REJECT_MASK;
+ tmp = rdm_buff.Register & EEPROM_REJECT_MASK;
bytes = rdmaltWithLock(ad, (UINT)rdm_buff.Register,
(PUINT)temp_buff, io_buff.OutputLength);
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 35/44] Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff"
Renamed variable "sWrmBuffer" -> "wrm_buff" in
bcm_char_ioctl_eeprom_reg_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f6af424..071b5e2 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -413,7 +413,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
struct bcm_mini_adapter *ad,
UINT cmd)
{
- struct bcm_wrm_buffer sWrmBuffer = {0};
+ struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer IoBuffer;
UINT uiTempVar = 0;
INT Status;
@@ -431,24 +431,24 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+ if (IoBuffer.InputLength > sizeof(wrm_buff))
return -EINVAL;
/* Get WrmBuffer structure */
- if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
+ if (copy_from_user(&wrm_buff, IoBuffer.InputBuffer,
IoBuffer.InputLength))
return -EFAULT;
- if ULONG)sWrmBuffer.Register & 0x0F00) != 0x0F00) ||
- ((ULONG)sWrmBuffer.Register & 0x3)) {
+ if ULONG)wrm_buff.Register & 0x0F00) != 0x0F00) ||
+ ((ULONG)wrm_buff.Register & 0x3)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"WRM Done On invalid Address : %x Access
Denied.\n",
- (int)sWrmBuffer.Register);
+ (int)wrm_buff.Register);
return -EINVAL;
}
- uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
+ uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
((uiTempVar == EEPROM_REJECT_REG_1) ||
(uiTempVar == EEPROM_REJECT_REG_2) ||
@@ -461,9 +461,9 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
return -EFAULT;
}
- Status = wrmaltWithLock(ad, (UINT)sWrmBuffer.Register,
- (PUINT)sWrmBuffer.Data,
- sWrmBuffer.Length);
+ Status = wrmaltWithLock(ad, (UINT)wrm_buff.Register,
+ (PUINT)wrm_buff.Data,
+ wrm_buff.Length);
if (Status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 36/44] Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff"
Renamed variable "IoBuffer" -> "io_buff" in
bcm_char_ioctl_eeprom_reg_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 071b5e2..7e2b1d1 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -414,7 +414,7 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
UINT cmd)
{
struct bcm_wrm_buffer wrm_buff = {0};
- struct bcm_ioctl_buffer IoBuffer;
+ struct bcm_ioctl_buffer io_buff;
UINT uiTempVar = 0;
INT Status;
@@ -428,15 +428,15 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
}
/* Copy Ioctl Buffer structure */
- if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+ if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(wrm_buff))
+ if (io_buff.InputLength > sizeof(wrm_buff))
return -EINVAL;
/* Get WrmBuffer structure */
- if (copy_from_user(&wrm_buff, IoBuffer.InputBuffer,
- IoBuffer.InputLength))
+ if (copy_from_user(&wrm_buff, io_buff.InputBuffer,
+ io_buff.InputLength))
return -EFAULT;
if ULONG)wrm_buff.Register & 0x0F00) != 0x0F00) ||
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 18/44] Staging: bcm: Bcmchar.c: Renamed variable "Packet" -> "packet"
Renamed variable "Packet" -> "packet" in bcm_char_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 38eeb0b..0c86e5d 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -187,7 +187,7 @@ static ssize_t bcm_char_read(struct file *filp,
{
struct bcm_tarang_data *tarang = filp->private_data;
struct bcm_mini_adapter *ad = tarang->Adapter;
- struct sk_buff *Packet = NULL;
+ struct sk_buff *packet = NULL;
ssize_t pkt_len = 0;
int wait_ret_val = 0;
unsigned long ret = 0;
@@ -215,7 +215,7 @@ static ssize_t bcm_char_read(struct file *filp,
down(&ad->RxAppControlQueuelock);
if (tarang->RxAppControlHead) {
- Packet = tarang->RxAppControlHead;
+ packet = tarang->RxAppControlHead;
DEQUEUEPACKET(tarang->RxAppControlHead,
tarang->RxAppControlTail);
tarang->AppCtrlQueueLen--;
@@ -223,20 +223,20 @@ static ssize_t bcm_char_read(struct file *filp,
up(&ad->RxAppControlQueuelock);
- if (Packet) {
- pkt_len = Packet->len;
- ret = copy_to_user(buf, Packet->data,
+ if (packet) {
+ pkt_len = packet->len;
+ ret = copy_to_user(buf, packet->data,
min_t(size_t, pkt_len, size));
if (ret) {
- dev_kfree_skb(Packet);
+ dev_kfree_skb(packet);
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"Returning from copy to user
failure\n");
return -EFAULT;
}
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Read %zd Bytes From Adapter packet = %p by
process %d!\n",
- pkt_len, Packet, current->pid);
- dev_kfree_skb(Packet);
+ pkt_len, packet, current->pid);
+ dev_kfree_skb(packet);
}
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n");
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 33/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 1f30cea..31a4f71 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -348,7 +348,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
struct bcm_ioctl_buffer io_buff;
PCHAR temp_buff = NULL;
UINT tmp = 0;
- INT Status;
+ INT status;
int bytes;
if ((ad->IdleMode == TRUE) ||
@@ -396,17 +396,17 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user
*argp,
(PUINT)temp_buff, io_buff.OutputLength);
if (bytes > 0) {
- Status = STATUS_SUCCESS;
+ status = STATUS_SUCCESS;
if (copy_to_user(io_buff.OutputBuffer, temp_buff, bytes)) {
kfree(temp_buff);
return -EFAULT;
}
} else {
- Status = bytes;
+ status = bytes;
}
kfree(temp_buff);
- return Status;
+ return status;
}
static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 19/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in
bcm_char_ioctl_reg_read_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 0c86e5d..0511298 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -244,7 +244,7 @@ static ssize_t bcm_char_read(struct file *filp,
}
static int bcm_char_ioctl_reg_read_private(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *ad)
{
struct bcm_rdm_buffer sRdmBuffer = {0};
struct bcm_ioctl_buffer IoBuffer;
@@ -278,7 +278,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
if (!temp_buff)
return -ENOMEM;
- bytes = rdmalt(Adapter, (UINT)sRdmBuffer.Register,
+ bytes = rdmalt(ad, (UINT)sRdmBuffer.Register,
(PUINT)temp_buff, Bufflen);
if (bytes > 0) {
Status = STATUS_SUCCESS;
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 34/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in bcm_char_ioctl_eeprom_reg_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 31a4f71..f6af424 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -410,7 +410,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
}
static int bcm_char_ioctl_eeprom_reg_write(void __user *argp,
- struct bcm_mini_adapter *Adapter,
+ struct bcm_mini_adapter *ad,
UINT cmd)
{
struct bcm_wrm_buffer sWrmBuffer = {0};
@@ -418,11 +418,11 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
UINT uiTempVar = 0;
INT Status;
- if ((Adapter->IdleMode == TRUE) ||
- (Adapter->bShutStatus == TRUE) ||
- (Adapter->bPreparingForLowPowerMode == TRUE)) {
+ if ((ad->IdleMode == TRUE) ||
+ (ad->bShutStatus == TRUE) ||
+ (ad->bPreparingForLowPowerMode == TRUE)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"Device in Idle Mode, Blocking Wrms\n");
return -EACCES;
}
@@ -442,34 +442,34 @@ static int bcm_char_ioctl_eeprom_reg_write(void __user
*argp,
if ULONG)sWrmBuffer.Register & 0x0F00) != 0x0F00) ||
((ULONG)sWrmBuffer.Register & 0x3)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"WRM Done On invalid Address : %x Access
Denied.\n",
(int)sWrmBuffer.Register);
return -EINVAL;
}
uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
- if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
+ if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
((uiTempVar == EEPROM_REJECT_REG_1) ||
(uiTempVar == EEPROM_REJECT_REG_2) ||
(uiTempVar == EEPROM_REJECT_REG_3) ||
(uiTempVar == EEPROM_REJECT_REG_4)) &&
(cmd == IOCTL_BCM_REGISTER_WRITE)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"EEPROM Access Denied, not in VSG
Mode\n");
return -EFAULT;
}
- Status = wrmaltWithLock(Adapter, (UINT)sWrmBuffer.Register,
+ Status = wrmaltWithLock(ad, (UINT)sWrmBuffer.Register,
(PUINT)sWrmBuffer.Data,
sWrmBuffer.Length);
if (Status == STATUS_SUCCESS) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, OSAL_DBG,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG,
DBG_LVL_ALL, "WRM Done\n");
} else {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, "WRM Failed\n");
Status = -EFAULT;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 17/44] Staging: bcm: Bcmchar.c: Renamed variable "PktLen" -> "pkt_len"
Renamed variable "PktLen" -> "pkt_len" in bcm_char_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index b96d6d8..38eeb0b 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -188,7 +188,7 @@ static ssize_t bcm_char_read(struct file *filp,
struct bcm_tarang_data *tarang = filp->private_data;
struct bcm_mini_adapter *ad = tarang->Adapter;
struct sk_buff *Packet = NULL;
- ssize_t PktLen = 0;
+ ssize_t pkt_len = 0;
int wait_ret_val = 0;
unsigned long ret = 0;
@@ -224,9 +224,9 @@ static ssize_t bcm_char_read(struct file *filp,
up(&ad->RxAppControlQueuelock);
if (Packet) {
- PktLen = Packet->len;
+ pkt_len = Packet->len;
ret = copy_to_user(buf, Packet->data,
- min_t(size_t, PktLen, size));
+ min_t(size_t, pkt_len, size));
if (ret) {
dev_kfree_skb(Packet);
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
@@ -235,12 +235,12 @@ static ssize_t bcm_char_read(struct file *filp,
}
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Read %zd Bytes From Adapter packet = %p by
process %d!\n",
- PktLen, Packet, current->pid);
+ pkt_len, Packet, current->pid);
dev_kfree_skb(Packet);
}
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n");
- return PktLen;
+ return pkt_len;
}
static int bcm_char_ioctl_reg_read_private(void __user *argp,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 11/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in bcm_char_open().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index c874f5c..6989327 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -104,27 +104,27 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter
*ad,
static int bcm_char_open(struct inode *inode, struct file *filp)
{
- struct bcm_mini_adapter *Adapter = NULL;
+ struct bcm_mini_adapter *ad = NULL;
struct bcm_tarang_data *pTarang = NULL;
- Adapter = GET_BCM_ADAPTER(gblpnetdev);
+ ad = GET_BCM_ADAPTER(gblpnetdev);
pTarang = kzalloc(sizeof(struct bcm_tarang_data), GFP_KERNEL);
if (!pTarang)
return -ENOMEM;
- pTarang->Adapter = Adapter;
+ pTarang->Adapter = ad;
pTarang->RxCntrlMsgBitMask = 0x & ~(1 << 0xB);
- down(&Adapter->RxAppControlQueuelock);
- pTarang->next = Adapter->pTarangs;
- Adapter->pTarangs = pTarang;
- up(&Adapter->RxAppControlQueuelock);
+ down(&ad->RxAppControlQueuelock);
+ pTarang->next = ad->pTarangs;
+ ad->pTarangs = pTarang;
+ up(&ad->RxAppControlQueuelock);
/* Store the Adapter structure */
filp->private_data = pTarang;
/* Start Queuing the control response Packets */
- atomic_inc(&Adapter->ApplicationRunning);
+ atomic_inc(&ad->ApplicationRunning);
nonseekable_open(inode, filp);
return 0;
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 10/44] Staging: bcm: Bcmchar.c: Renamed variable "ulDSDMagicNumInUsrBuff" -> "dsd_magic_num_in_usr_buff"
Renamed variable "ulDSDMagicNumInUsrBuff" ->
"dsd_magic_num_in_usr_buff" in handle_flash2x_adapter().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 129080e..c874f5c 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -59,7 +59,7 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
* considered valid.
*/
INT status;
- ULONG ulDSDMagicNumInUsrBuff = 0;
+ ULONG dsd_magic_num_in_usr_buff = 0;
status = BcmFlash2xCorruptSig(ad, ad->eActiveDSD);
if (status == STATUS_SUCCESS)
@@ -76,10 +76,10 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter
*ad,
return status;
}
- ulDSDMagicNumInUsrBuff =
+ dsd_magic_num_in_usr_buff =
ntohl(*(PUINT)(read_data + nvm_rw->uiNumBytes -
SIGNATURE_SIZE));
- if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
+ if (dsd_magic_num_in_usr_buff != DSD_IMAGE_MAGIC_NUMBER) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"DSD Sig is present neither in Flash nor User
provided Input..");
up(&ad->NVMRdmWrmLock);
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 12/44] Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang"
Renamed variable "pTarang" -> "tarang" in bcm_char_open().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 6989327..aba63f9 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -105,23 +105,23 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter
*ad,
static int bcm_char_open(struct inode *inode, struct file *filp)
{
struct bcm_mini_adapter *ad = NULL;
- struct bcm_tarang_data *pTarang = NULL;
+ struct bcm_tarang_data *tarang = NULL;
ad = GET_BCM_ADAPTER(gblpnetdev);
- pTarang = kzalloc(sizeof(struct bcm_tarang_data), GFP_KERNEL);
- if (!pTarang)
+ tarang = kzalloc(sizeof(struct bcm_tarang_data), GFP_KERNEL);
+ if (!tarang)
return -ENOMEM;
- pTarang->Adapter = ad;
- pTarang->RxCntrlMsgBitMask = 0x & ~(1 << 0xB);
+ tarang->Adapter = ad;
+ tarang->RxCntrlMsgBitMask = 0x & ~(1 << 0xB);
down(&ad->RxAppControlQueuelock);
- pTarang->next = ad->pTarangs;
- ad->pTarangs = pTarang;
+ tarang->next = ad->pTarangs;
+ ad->pTarangs = tarang;
up(&ad->RxAppControlQueuelock);
/* Store the Adapter structure */
- filp->private_data = pTarang;
+ filp->private_data = tarang;
/* Start Queuing the control response Packets */
atomic_inc(&ad->ApplicationRunning);
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 13/44] Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang"
Renamed variable "pTarang" -> "tarang" in bcm_char_release().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index aba63f9..e7d733e 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -132,22 +132,22 @@ static int bcm_char_open(struct inode *inode, struct file
*filp)
static int bcm_char_release(struct inode *inode, struct file *filp)
{
- struct bcm_tarang_data *pTarang, *tmp, *ptmp;
+ struct bcm_tarang_data *tarang, *tmp, *ptmp;
struct bcm_mini_adapter *Adapter = NULL;
struct sk_buff *pkt, *npkt;
- pTarang = (struct bcm_tarang_data *)filp->private_data;
+ tarang = (struct bcm_tarang_data *)filp->private_data;
- if (pTarang == NULL)
+ if (tarang == NULL)
return 0;
- Adapter = pTarang->Adapter;
+ Adapter = tarang->Adapter;
down(&Adapter->RxAppControlQueuelock);
tmp = Adapter->pTarangs;
for (ptmp = NULL; tmp; ptmp = tmp, tmp = tmp->next) {
- if (tmp == pTarang)
+ if (tmp == tarang)
break;
}
@@ -161,7 +161,7 @@ static int bcm_char_release(struct inode *inode, struct
file *filp)
return 0;
}
- pkt = pTarang->RxAppControlHead;
+ pkt = tarang->RxAppControlHead;
while (pkt) {
npkt = pkt->next;
kfree_skb(pkt);
@@ -173,7 +173,7 @@ static int bcm_char_release(struct inode *inode, struct
file *filp)
/* Stop Queuing the control response Packets */
atomic_dec(&Adapter->ApplicationRunning);
- kfree(pTarang);
+ kfree(tarang);
/* remove this filp from the asynchronously notified filp's */
filp->private_data = NULL;
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 15/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in bcm_char_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index d7e1277..2d9c26b 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -186,33 +186,33 @@ static ssize_t bcm_char_read(struct file *filp,
loff_t *f_pos)
{
struct bcm_tarang_data *pTarang = filp->private_data;
- struct bcm_mini_adapter *Adapter = pTarang->Adapter;
+ struct bcm_mini_adapter *ad = pTarang->Adapter;
struct sk_buff *Packet = NULL;
ssize_t PktLen = 0;
int wait_ret_val = 0;
unsigned long ret = 0;
wait_ret_val = wait_event_interruptible(
- Adapter->process_read_wait_queue,
+ ad->process_read_wait_queue,
(pTarang->RxAppControlHead ||
- Adapter->device_removed));
+ ad->device_removed));
if ((wait_ret_val == -ERESTARTSYS)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Exiting as i've been asked to exit!!!\n");
return wait_ret_val;
}
- if (Adapter->device_removed) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+ if (ad->device_removed) {
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Device Removed... Killing the Apps...\n");
return -ENODEV;
}
- if (false == Adapter->fw_download_done)
+ if (false == ad->fw_download_done)
return -EACCES;
- down(&Adapter->RxAppControlQueuelock);
+ down(&ad->RxAppControlQueuelock);
if (pTarang->RxAppControlHead) {
Packet = pTarang->RxAppControlHead;
@@ -221,7 +221,7 @@ static ssize_t bcm_char_read(struct file *filp,
pTarang->AppCtrlQueueLen--;
}
- up(&Adapter->RxAppControlQueuelock);
+ up(&ad->RxAppControlQueuelock);
if (Packet) {
PktLen = Packet->len;
@@ -229,17 +229,17 @@ static ssize_t bcm_char_read(struct file *filp,
min_t(size_t, PktLen, size));
if (ret) {
dev_kfree_skb(Packet);
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"Returning from copy to user
failure\n");
return -EFAULT;
}
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Read %zd Bytes From Adapter packet = %p by
process %d!\n",
PktLen, Packet, current->pid);
dev_kfree_skb(Packet);
}
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n");
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n");
return PktLen;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 14/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in bcm_char_release().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index e7d733e..d7e1277 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -133,7 +133,7 @@ static int bcm_char_open(struct inode *inode, struct file
*filp)
static int bcm_char_release(struct inode *inode, struct file *filp)
{
struct bcm_tarang_data *tarang, *tmp, *ptmp;
- struct bcm_mini_adapter *Adapter = NULL;
+ struct bcm_mini_adapter *ad = NULL;
struct sk_buff *pkt, *npkt;
tarang = (struct bcm_tarang_data *)filp->private_data;
@@ -141,11 +141,11 @@ static int bcm_char_release(struct inode *inode, struct
file *filp)
if (tarang == NULL)
return 0;
- Adapter = tarang->Adapter;
+ ad = tarang->Adapter;
- down(&Adapter->RxAppControlQueuelock);
+ down(&ad->RxAppControlQueuelock);
- tmp = Adapter->pTarangs;
+ tmp = ad->pTarangs;
for (ptmp = NULL; tmp; ptmp = tmp, tmp = tmp->next) {
if (tmp == tarang)
break;
@@ -153,11 +153,11 @@ static int bcm_char_release(struct inode *inode, struct
file *filp)
if (tmp) {
if (!ptmp)
- Adapter->pTarangs = tmp->next;
+ ad->pTarangs = tmp->next;
else
ptmp->next = tmp->next;
} else {
- up(&Adapter->RxAppControlQueuelock);
+ up(&ad->RxAppControlQueuelock);
return 0;
}
@@ -168,10 +168,10 @@ static int bcm_char_release(struct inode *inode, struct
file *filp)
pkt = npkt;
}
- up(&Adapter->RxAppControlQueuelock);
+ up(&ad->RxAppControlQueuelock);
/* Stop Queuing the control response Packets */
- atomic_dec(&Adapter->ApplicationRunning);
+ atomic_dec(&ad->ApplicationRunning);
kfree(tarang);
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 16/44] Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang"
Renamed variable "pTarang" -> "tarang" in bcm_char_read().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 2d9c26b..b96d6d8 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -185,8 +185,8 @@ static ssize_t bcm_char_read(struct file *filp,
size_t size,
loff_t *f_pos)
{
- struct bcm_tarang_data *pTarang = filp->private_data;
- struct bcm_mini_adapter *ad = pTarang->Adapter;
+ struct bcm_tarang_data *tarang = filp->private_data;
+ struct bcm_mini_adapter *ad = tarang->Adapter;
struct sk_buff *Packet = NULL;
ssize_t PktLen = 0;
int wait_ret_val = 0;
@@ -194,7 +194,7 @@ static ssize_t bcm_char_read(struct file *filp,
wait_ret_val = wait_event_interruptible(
ad->process_read_wait_queue,
- (pTarang->RxAppControlHead ||
+ (tarang->RxAppControlHead ||
ad->device_removed));
if ((wait_ret_val == -ERESTARTSYS)) {
@@ -214,11 +214,11 @@ static ssize_t bcm_char_read(struct file *filp,
down(&ad->RxAppControlQueuelock);
- if (pTarang->RxAppControlHead) {
- Packet = pTarang->RxAppControlHead;
- DEQUEUEPACKET(pTarang->RxAppControlHead,
- pTarang->RxAppControlTail);
- pTarang->AppCtrlQueueLen--;
+ if (tarang->RxAppControlHead) {
+ Packet = tarang->RxAppControlHead;
+ DEQUEUEPACKET(tarang->RxAppControlHead,
+ tarang->RxAppControlTail);
+ tarang->AppCtrlQueueLen--;
}
up(&ad->RxAppControlQueuelock);
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 44/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in
bcm_char_ioctl_gpio_set_request().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 32b767f..8b23ec9 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -485,7 +485,7 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
UINT value = 0;
UINT bit = 0;
UINT operation = 0;
- INT Status;
+ INT status;
int bytes;
if ((ad->IdleMode == TRUE) ||
@@ -523,11 +523,11 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
/* Set - setting 1 */
if (operation) {
/* Set the gpio output register */
- Status = wrmaltWithLock(ad,
+ status = wrmaltWithLock(ad,
BCM_GPIO_OUTPUT_SET_REG,
(PUINT)(&value), sizeof(UINT));
- if (Status == STATUS_SUCCESS) {
+ if (status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
OSAL_DBG, DBG_LVL_ALL,
"Set the GPIO bit\n");
@@ -536,15 +536,15 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
OSAL_DBG, DBG_LVL_ALL,
"Failed to set the %dth GPIO\n",
bit);
- return Status;
+ return status;
}
} else {
/* Set the gpio output register */
- Status = wrmaltWithLock(ad,
+ status = wrmaltWithLock(ad,
BCM_GPIO_OUTPUT_CLR_REG,
(PUINT)(&value), sizeof(UINT));
- if (Status == STATUS_SUCCESS) {
+ if (status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS,
OSAL_DBG, DBG_LVL_ALL,
"Set the GPIO bit\n");
@@ -553,27 +553,27 @@ static int bcm_char_ioctl_gpio_set_request(void __user
*argp,
OSAL_DBG, DBG_LVL_ALL,
"Failed to clear the %dth GPIO\n",
bit);
- return Status;
+ return status;
}
}
bytes = rdmaltWithLock(ad, (UINT)GPIO_MODE_REGISTER,
(PUINT)reset_val, sizeof(UINT));
if (bytes < 0) {
- Status = bytes;
+ status = bytes;
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"GPIO_MODE_REGISTER read failed");
- return Status;
+ return status;
} else {
- Status = STATUS_SUCCESS;
+ status = STATUS_SUCCESS;
}
/* Set the gpio mode register to output */
*(UINT *)reset_val |= (1
[PATCH 24/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in
bcm_char_ioctl_reg_write_private()
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 59fc757..f88b4ad 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -295,7 +295,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
}
static int bcm_char_ioctl_reg_write_private(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *ad)
{
struct bcm_wrm_buffer sWrmBuffer = {0};
struct bcm_ioctl_buffer IoBuffer;
@@ -316,25 +316,25 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
return -EFAULT;
uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
- if (!((Adapter->pstargetparams->m_u32Customize) & VSG_MODE) &&
+ if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
((uiTempVar == EEPROM_REJECT_REG_1) ||
(uiTempVar == EEPROM_REJECT_REG_2) ||
(uiTempVar == EEPROM_REJECT_REG_3) ||
(uiTempVar == EEPROM_REJECT_REG_4))) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"EEPROM Access Denied, not in VSG Mode\n");
return -EFAULT;
}
- Status = wrmalt(Adapter, (UINT)sWrmBuffer.Register,
+ Status = wrmalt(ad, (UINT)sWrmBuffer.Register,
(PUINT)sWrmBuffer.Data, sizeof(ULONG));
if (Status == STATUS_SUCCESS) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, "WRM Done\n");
} else {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, "WRM Failed\n");
Status = -EFAULT;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 29/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 53c26d5..9e8dd74 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -342,7 +342,7 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
}
static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *ad)
{
struct bcm_rdm_buffer sRdmBuffer = {0};
struct bcm_ioctl_buffer IoBuffer;
@@ -351,11 +351,11 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user
*argp,
INT Status;
int bytes;
- if ((Adapter->IdleMode == TRUE) ||
- (Adapter->bShutStatus == TRUE) ||
- (Adapter->bPreparingForLowPowerMode == TRUE)) {
+ if ((ad->IdleMode == TRUE) ||
+ (ad->bShutStatus == TRUE) ||
+ (ad->bPreparingForLowPowerMode == TRUE)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"Device in Idle Mode, Blocking Rdms\n");
return -EACCES;
}
@@ -383,7 +383,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
if ULONG)sRdmBuffer.Register & 0x0F00) != 0x0F00) ||
((ULONG)sRdmBuffer.Register & 0x3)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"RDM Done On invalid Address : %x Access
Denied.\n",
(int)sRdmBuffer.Register);
@@ -392,7 +392,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
}
uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
- bytes = rdmaltWithLock(Adapter, (UINT)sRdmBuffer.Register,
+ bytes = rdmaltWithLock(ad, (UINT)sRdmBuffer.Register,
(PUINT)temp_buff, IoBuffer.OutputLength);
if (bytes > 0) {
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 27/44] Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp"
Renamed variable "uiTempVar" -> "tmp" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index cf94eea..b3e68b8 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -299,7 +299,7 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
{
struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer io_buff;
- UINT uiTempVar = 0;
+ UINT tmp = 0;
INT Status;
/* Copy Ioctl Buffer structure */
@@ -315,12 +315,12 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
io_buff.InputLength))
return -EFAULT;
- uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
+ tmp = wrm_buff.Register & EEPROM_REJECT_MASK;
if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
- ((uiTempVar == EEPROM_REJECT_REG_1) ||
- (uiTempVar == EEPROM_REJECT_REG_2) ||
- (uiTempVar == EEPROM_REJECT_REG_3) ||
- (uiTempVar == EEPROM_REJECT_REG_4))) {
+ ((tmp == EEPROM_REJECT_REG_1) ||
+ (tmp == EEPROM_REJECT_REG_2) ||
+ (tmp == EEPROM_REJECT_REG_3) ||
+ (tmp == EEPROM_REJECT_REG_4))) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"EEPROM Access Denied, not in VSG Mode\n");
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 23/44] Staging: bcm: Bcmchar.c: Renamed variable "Bufflen" -> "buff_len"
Renamed variable "Bufflen" -> "buff_len" in
bcm_char_ioctl_reg_read_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index a39b8b0..59fc757 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -250,7 +250,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
struct bcm_ioctl_buffer io_buff;
PCHAR temp_buff;
INT status = STATUS_FAILURE;
- UINT Bufflen;
+ UINT buff_len;
u16 temp_value;
int bytes;
@@ -270,16 +270,16 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
return -EINVAL;
}
- Bufflen = io_buff.OutputLength;
- temp_value = 4 - (Bufflen % 4);
- Bufflen += temp_value % 4;
+ buff_len = io_buff.OutputLength;
+ temp_value = 4 - (buff_len % 4);
+ buff_len += temp_value % 4;
- temp_buff = kmalloc(Bufflen, GFP_KERNEL);
+ temp_buff = kmalloc(buff_len, GFP_KERNEL);
if (!temp_buff)
return -ENOMEM;
bytes = rdmalt(ad, (UINT)rdm_buff.Register,
- (PUINT)temp_buff, Bufflen);
+ (PUINT)temp_buff, buff_len);
if (bytes > 0) {
status = STATUS_SUCCESS;
if (copy_to_user(io_buff.OutputBuffer, temp_buff, bytes)) {
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 31/44] Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff"
Renamed variable "IoBuffer" -> "io_buff" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 4127e5b..5c6ae99 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -345,7 +345,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
struct bcm_mini_adapter *ad)
{
struct bcm_rdm_buffer rdm_buff = {0};
- struct bcm_ioctl_buffer IoBuffer;
+ struct bcm_ioctl_buffer io_buff;
PCHAR temp_buff = NULL;
UINT uiTempVar = 0;
INT Status;
@@ -361,22 +361,22 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user
*argp,
}
/* Copy Ioctl Buffer structure */
- if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+ if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(rdm_buff))
+ if (io_buff.InputLength > sizeof(rdm_buff))
return -EINVAL;
- if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer,
- IoBuffer.InputLength))
+ if (copy_from_user(&rdm_buff, io_buff.InputBuffer,
+ io_buff.InputLength))
return -EFAULT;
- if (IoBuffer.OutputLength > USHRT_MAX ||
- IoBuffer.OutputLength == 0) {
+ if (io_buff.OutputLength > USHRT_MAX ||
+ io_buff.OutputLength == 0) {
return -EINVAL;
}
- temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL);
+ temp_buff = kmalloc(io_buff.OutputLength, GFP_KERNEL);
if (!temp_buff)
return STATUS_FAILURE;
@@ -393,11 +393,11 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user
*argp,
uiTempVar = rdm_buff.Register & EEPROM_REJECT_MASK;
bytes = rdmaltWithLock(ad, (UINT)rdm_buff.Register,
- (PUINT)temp_buff, IoBuffer.OutputLength);
+ (PUINT)temp_buff, io_buff.OutputLength);
if (bytes > 0) {
Status = STATUS_SUCCESS;
- if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) {
+ if (copy_to_user(io_buff.OutputBuffer, temp_buff, bytes)) {
kfree(temp_buff);
return -EFAULT;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 30/44] Staging: bcm: Bcmchar.c: Renamed variable "sRdmBuffer" -> "rdm_buff"
Renamed variable "sRdmBuffer" -> "rdm_buff" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 9e8dd74..4127e5b 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -344,7 +344,7 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
struct bcm_mini_adapter *ad)
{
- struct bcm_rdm_buffer sRdmBuffer = {0};
+ struct bcm_rdm_buffer rdm_buff = {0};
struct bcm_ioctl_buffer IoBuffer;
PCHAR temp_buff = NULL;
UINT uiTempVar = 0;
@@ -364,10 +364,10 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user
*argp,
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(sRdmBuffer))
+ if (IoBuffer.InputLength > sizeof(rdm_buff))
return -EINVAL;
- if (copy_from_user(&sRdmBuffer, IoBuffer.InputBuffer,
+ if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer,
IoBuffer.InputLength))
return -EFAULT;
@@ -380,19 +380,19 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user
*argp,
if (!temp_buff)
return STATUS_FAILURE;
- if ULONG)sRdmBuffer.Register & 0x0F00) != 0x0F00) ||
- ((ULONG)sRdmBuffer.Register & 0x3)) {
+ if ULONG)rdm_buff.Register & 0x0F00) != 0x0F00) ||
+ ((ULONG)rdm_buff.Register & 0x3)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"RDM Done On invalid Address : %x Access
Denied.\n",
- (int)sRdmBuffer.Register);
+ (int)rdm_buff.Register);
kfree(temp_buff);
return -EINVAL;
}
- uiTempVar = sRdmBuffer.Register & EEPROM_REJECT_MASK;
- bytes = rdmaltWithLock(ad, (UINT)sRdmBuffer.Register,
+ uiTempVar = rdm_buff.Register & EEPROM_REJECT_MASK;
+ bytes = rdmaltWithLock(ad, (UINT)rdm_buff.Register,
(PUINT)temp_buff, IoBuffer.OutputLength);
if (bytes > 0) {
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 26/44] Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff"
Renamed variable "IoBuffer" -> "io_buff" in
in bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index ee53df6..cf94eea 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -298,21 +298,21 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
struct bcm_mini_adapter *ad)
{
struct bcm_wrm_buffer wrm_buff = {0};
- struct bcm_ioctl_buffer IoBuffer;
+ struct bcm_ioctl_buffer io_buff;
UINT uiTempVar = 0;
INT Status;
/* Copy Ioctl Buffer structure */
- if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
+ if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(wrm_buff))
+ if (io_buff.InputLength > sizeof(wrm_buff))
return -EINVAL;
/* Get WrmBuffer structure */
- if (copy_from_user(&wrm_buff, IoBuffer.InputBuffer,
- IoBuffer.InputLength))
+ if (copy_from_user(&wrm_buff, io_buff.InputBuffer,
+ io_buff.InputLength))
return -EFAULT;
uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 28/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in
bcm_char_ioctl_reg_write_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index b3e68b8..53c26d5 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -300,7 +300,7 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer io_buff;
UINT tmp = 0;
- INT Status;
+ INT status;
/* Copy Ioctl Buffer structure */
@@ -327,18 +327,18 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
return -EFAULT;
}
- Status = wrmalt(ad, (UINT)wrm_buff.Register,
+ status = wrmalt(ad, (UINT)wrm_buff.Register,
(PUINT)wrm_buff.Data, sizeof(ULONG));
- if (Status == STATUS_SUCCESS) {
+ if (status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, "WRM Done\n");
} else {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
DBG_LVL_ALL, "WRM Failed\n");
- Status = -EFAULT;
+ status = -EFAULT;
}
- return Status;
+ return status;
}
static int bcm_char_ioctl_eeprom_reg_read(void __user *argp,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 25/44] Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff"
Renamed variable "sWrmBuffer" -> "wrm_buff" in
bcm_char_ioctl_reg_write_private()
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index f88b4ad..ee53df6 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -297,7 +297,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
static int bcm_char_ioctl_reg_write_private(void __user *argp,
struct bcm_mini_adapter *ad)
{
- struct bcm_wrm_buffer sWrmBuffer = {0};
+ struct bcm_wrm_buffer wrm_buff = {0};
struct bcm_ioctl_buffer IoBuffer;
UINT uiTempVar = 0;
INT Status;
@@ -307,15 +307,15 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer)))
return -EFAULT;
- if (IoBuffer.InputLength > sizeof(sWrmBuffer))
+ if (IoBuffer.InputLength > sizeof(wrm_buff))
return -EINVAL;
/* Get WrmBuffer structure */
- if (copy_from_user(&sWrmBuffer, IoBuffer.InputBuffer,
+ if (copy_from_user(&wrm_buff, IoBuffer.InputBuffer,
IoBuffer.InputLength))
return -EFAULT;
- uiTempVar = sWrmBuffer.Register & EEPROM_REJECT_MASK;
+ uiTempVar = wrm_buff.Register & EEPROM_REJECT_MASK;
if (!((ad->pstargetparams->m_u32Customize) & VSG_MODE) &&
((uiTempVar == EEPROM_REJECT_REG_1) ||
(uiTempVar == EEPROM_REJECT_REG_2) ||
@@ -327,8 +327,8 @@ static int bcm_char_ioctl_reg_write_private(void __user
*argp,
return -EFAULT;
}
- Status = wrmalt(ad, (UINT)sWrmBuffer.Register,
- (PUINT)sWrmBuffer.Data, sizeof(ULONG));
+ Status = wrmalt(ad, (UINT)wrm_buff.Register,
+ (PUINT)wrm_buff.Data, sizeof(ULONG));
if (Status == STATUS_SUCCESS) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 22/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in
bcm_char_ioctl_reg_read_private().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index a85437e..a39b8b0 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -249,7 +249,7 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
struct bcm_rdm_buffer rdm_buff = {0};
struct bcm_ioctl_buffer io_buff;
PCHAR temp_buff;
- INT Status = STATUS_FAILURE;
+ INT status = STATUS_FAILURE;
UINT Bufflen;
u16 temp_value;
int bytes;
@@ -281,17 +281,17 @@ static int bcm_char_ioctl_reg_read_private(void __user
*argp,
bytes = rdmalt(ad, (UINT)rdm_buff.Register,
(PUINT)temp_buff, Bufflen);
if (bytes > 0) {
- Status = STATUS_SUCCESS;
+ status = STATUS_SUCCESS;
if (copy_to_user(io_buff.OutputBuffer, temp_buff, bytes)) {
kfree(temp_buff);
return -EFAULT;
}
} else {
- Status = bytes;
+ status = bytes;
}
kfree(temp_buff);
- return Status;
+ return status;
}
static int bcm_char_ioctl_reg_write_private(void __user *argp,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 06/44] Staging: bcm: Bcmchar.c: Renamed variable "pReadData" -> "read_data"
Renamed variable "pReadData" -> "read_data" in handle_flash2x_adapter().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 774ec12..d2e330a 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -40,7 +40,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
}
static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
- PUCHAR pReadData,
+ PUCHAR read_data,
struct bcm_nvm_readwrite *stNVMReadWrite)
{
/*
@@ -72,18 +72,18 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter
*ad,
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"DSD Sig is present neither in Flash nor User
provided Input..");
up(&ad->NVMRdmWrmLock);
- kfree(pReadData);
+ kfree(read_data);
return Status;
}
ulDSDMagicNumInUsrBuff =
- ntohl(*(PUINT)(pReadData + stNVMReadWrite->uiNumBytes -
+ ntohl(*(PUINT)(read_data + stNVMReadWrite->uiNumBytes -
SIGNATURE_SIZE));
if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"DSD Sig is present neither in Flash nor User
provided Input..");
up(&ad->NVMRdmWrmLock);
- kfree(pReadData);
+ kfree(read_data);
return Status;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in
bcm_handle_nvm_read_cmd().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 328b93c..62bdec5 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -6,7 +6,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad,
PUCHAR read_data,
struct bcm_nvm_readwrite *nvm_rw)
{
- INT Status = STATUS_FAILURE;
+ INT status = STATUS_FAILURE;
down(&ad->NVMRdmWrmLock);
@@ -21,14 +21,14 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
return -EACCES;
}
- Status = BeceemNVMRead(ad, (PUINT)read_data,
+ status = BeceemNVMRead(ad, (PUINT)read_data,
nvm_rw->uiOffset,
nvm_rw->uiNumBytes);
up(&ad->NVMRdmWrmLock);
- if (Status != STATUS_SUCCESS) {
+ if (status != STATUS_SUCCESS) {
kfree(read_data);
- return Status;
+ return status;
}
if (copy_to_user(nvm_rw->pBuffer, read_data, nvm_rw->uiNumBytes)) {
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 09/44] Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status"
Renamed variable "Status" -> "status" in handle_flash2x_adapter(). Signed-off-by: Matthias Beyer --- drivers/staging/bcm/Bcmchar.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 62bdec5..129080e 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -58,11 +58,11 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, * if DSD sig is corrupted, DSD data won't be * considered valid. */ - INT Status; + INT status; ULONG ulDSDMagicNumInUsrBuff = 0; - Status = BcmFlash2xCorruptSig(ad, ad->eActiveDSD); - if (Status == STATUS_SUCCESS) + status = BcmFlash2xCorruptSig(ad, ad->eActiveDSD); + if (status == STATUS_SUCCESS) return STATUS_SUCCESS; if (((nvm_rw->uiOffset + nvm_rw->uiNumBytes) != @@ -73,7 +73,7 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, "DSD Sig is present neither in Flash nor User provided Input.."); up(&ad->NVMRdmWrmLock); kfree(read_data); - return Status; + return status; } ulDSDMagicNumInUsrBuff = @@ -84,7 +84,7 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad, "DSD Sig is present neither in Flash nor User provided Input.."); up(&ad->NVMRdmWrmLock); kfree(read_data); - return Status; + return status; } return STATUS_SUCCESS; -- 2.0.3 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 07/44] Staging: bcm: Bcmchar.c: Renamed variable "stNVMReadWrite" -> "nvm_rw"
Renamed variable "stNVMReadWrite" -> "nvm_rw" in
handle_flash2x_adapter().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index d2e330a..328b93c 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -41,7 +41,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
PUCHAR read_data,
- struct bcm_nvm_readwrite *stNVMReadWrite)
+ struct bcm_nvm_readwrite *nvm_rw)
{
/*
* New Requirement:-
@@ -65,9 +65,9 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
if (Status == STATUS_SUCCESS)
return STATUS_SUCCESS;
- if (((stNVMReadWrite->uiOffset + stNVMReadWrite->uiNumBytes) !=
+ if (((nvm_rw->uiOffset + nvm_rw->uiNumBytes) !=
ad->uiNVMDSDSize) ||
- (stNVMReadWrite->uiNumBytes < SIGNATURE_SIZE)) {
+ (nvm_rw->uiNumBytes < SIGNATURE_SIZE)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"DSD Sig is present neither in Flash nor User
provided Input..");
@@ -77,7 +77,7 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
}
ulDSDMagicNumInUsrBuff =
- ntohl(*(PUINT)(read_data + stNVMReadWrite->uiNumBytes -
+ ntohl(*(PUINT)(read_data + nvm_rw->uiNumBytes -
SIGNATURE_SIZE));
if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 05/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in handle_flash2x_adapter().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 52f810d..774ec12 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -39,7 +39,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
return STATUS_SUCCESS;
}
-static int handle_flash2x_adapter(struct bcm_mini_adapter *Adapter,
+static int handle_flash2x_adapter(struct bcm_mini_adapter *ad,
PUCHAR pReadData,
struct bcm_nvm_readwrite *stNVMReadWrite)
{
@@ -61,17 +61,17 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter
*Adapter,
INT Status;
ULONG ulDSDMagicNumInUsrBuff = 0;
- Status = BcmFlash2xCorruptSig(Adapter, Adapter->eActiveDSD);
+ Status = BcmFlash2xCorruptSig(ad, ad->eActiveDSD);
if (Status == STATUS_SUCCESS)
return STATUS_SUCCESS;
if (((stNVMReadWrite->uiOffset + stNVMReadWrite->uiNumBytes) !=
- Adapter->uiNVMDSDSize) ||
+ ad->uiNVMDSDSize) ||
(stNVMReadWrite->uiNumBytes < SIGNATURE_SIZE)) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"DSD Sig is present neither in Flash nor User
provided Input..");
- up(&Adapter->NVMRdmWrmLock);
+ up(&ad->NVMRdmWrmLock);
kfree(pReadData);
return Status;
}
@@ -80,9 +80,9 @@ static int handle_flash2x_adapter(struct bcm_mini_adapter
*Adapter,
ntohl(*(PUINT)(pReadData + stNVMReadWrite->uiNumBytes -
SIGNATURE_SIZE));
if (ulDSDMagicNumInUsrBuff != DSD_IMAGE_MAGIC_NUMBER) {
- BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
+ BCM_DEBUG_PRINT(ad, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"DSD Sig is present neither in Flash nor User
provided Input..");
- up(&Adapter->NVMRdmWrmLock);
+ up(&ad->NVMRdmWrmLock);
kfree(pReadData);
return Status;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 03/44] Staging: bcm: Bcmchar.c: Renamed variable "pReadData" -> "read_data"
Renamed variable "pReadData" -> "read_data" in bcm_handle_nvm_read_cmd().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 4b02a41..8a07118 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -3,7 +3,7 @@
#include "headers.h"
static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad,
- PUCHAR pReadData,
+ PUCHAR read_data,
struct bcm_nvm_readwrite *stNVMReadWrite)
{
INT Status = STATUS_FAILURE;
@@ -17,23 +17,23 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Device is in Idle/Shutdown Mode\n");
up(&ad->NVMRdmWrmLock);
- kfree(pReadData);
+ kfree(read_data);
return -EACCES;
}
- Status = BeceemNVMRead(ad, (PUINT)pReadData,
+ Status = BeceemNVMRead(ad, (PUINT)read_data,
stNVMReadWrite->uiOffset,
stNVMReadWrite->uiNumBytes);
up(&ad->NVMRdmWrmLock);
if (Status != STATUS_SUCCESS) {
- kfree(pReadData);
+ kfree(read_data);
return Status;
}
- if (copy_to_user(stNVMReadWrite->pBuffer, pReadData,
+ if (copy_to_user(stNVMReadWrite->pBuffer, read_data,
stNVMReadWrite->uiNumBytes)) {
- kfree(pReadData);
+ kfree(read_data);
return -EFAULT;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 00/44] drivers/staging/bcm/Bcmchar.c variable name rename patches
Hi, as announced, I started renaming variables in the bcm staging driver. I started with the Bcmchar.c file, this patchset is the first quarter, I'm not completely done with the file by now. _IF YOU WANT_ you can already apply these patches, if they are ok for you. I can rebase & squash them, of course, but as I don't know how to do these patches, I wrote one per variable per function, to have the smallest set of changes per patch. So these are the patches for the drivers/staging/bcm/Bcmchar.c file which do _only_ rename variables. Please note, as always: As I do not have the appropriate hardware, I'm not able to test these patches. I compiled them at least. Kind regards, Matthias Beyer Matthias Beyer (44): Staging: bcm: Bcmchar.c: Fixed indentation of function arguments Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "pReadData" -> "read_data" Staging: bcm: Bcmchar.c: Renamed variable "stNVMReadWrite" -> "nvm_rw" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "pReadData" -> "read_data" Staging: bcm: Bcmchar.c: Renamed variable "stNVMReadWrite" -> "nvm_rw" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" Staging: bcm: Bcmchar.c: Renamed variable "ulDSDMagicNumInUsrBuff" -> "dsd_magic_num_in_usr_buff" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang" Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "pTarang" -> "tarang" Staging: bcm: Bcmchar.c: Renamed variable "PktLen" -> "pkt_len" Staging: bcm: Bcmchar.c: Renamed variable "Packet" -> "packet" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "sRdmBuffer" -> "rdm_buff" Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" Staging: bcm: Bcmchar.c: Renamed variable "Bufflen" -> "buff_len" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff" Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff" Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "sRdmBuffer" -> "rdm_buff" Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff" Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "sWrmBuffer" -> "wrm_buff" Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff" Staging: bcm: Bcmchar.c: Renamed variable "uiTempVar" -> "tmp" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad" Staging: bcm: Bcmchar.c: Renamed variable "IoBuffer" -> "io_buff" Staging: bcm: Bcmchar.c: Renamed variable "ucResetValue" -> "reset_val" Staging: bcm: Bcmchar.c: Renamed variable "uiBit" -> "bit" Staging: bcm: Bcmchar.c: Renamed variable "uiOperation" -> "operation" Staging: bcm: Bcmchar.c: Renamed variable "Status" -> "status" drivers/staging/bcm/Bcmchar.c | 537 +- 1 file changed, 271 insertions(+), 266 deletions(-) -- 2.0.3 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 01/44] Staging: bcm: Bcmchar.c: Fixed indentation of function arguments
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 56 ---
1 file changed, 31 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index c1e01f7..aff21d0 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -3,7 +3,8 @@
#include "headers.h"
static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *Adapter,
- PUCHAR pReadData, struct bcm_nvm_readwrite *stNVMReadWrite)
+ PUCHAR pReadData,
+ struct bcm_nvm_readwrite *stNVMReadWrite)
{
INT Status = STATUS_FAILURE;
@@ -40,7 +41,8 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*Adapter,
}
static int handle_flash2x_adapter(struct bcm_mini_adapter *Adapter,
- PUCHAR pReadData, struct bcm_nvm_readwrite *stNVMReadWrite)
+ PUCHAR pReadData,
+ struct bcm_nvm_readwrite *stNVMReadWrite)
{
/*
* New Requirement:-
@@ -179,7 +181,9 @@ static int bcm_char_release(struct inode *inode, struct
file *filp)
return 0;
}
-static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size,
+static ssize_t bcm_char_read(struct file *filp,
+char __user *buf,
+size_t size,
loff_t *f_pos)
{
struct bcm_tarang_data *pTarang = filp->private_data;
@@ -635,7 +639,7 @@ static int bcm_char_ioctl_led_thread_state_change_req(void
__user *argp,
}
static int bcm_char_ioctl_gpio_status_request(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
struct bcm_gpio_info gpio_info = {0};
struct bcm_ioctl_buffer IoBuffer;
@@ -677,7 +681,7 @@ static int bcm_char_ioctl_gpio_status_request(void __user
*argp,
}
static int bcm_char_ioctl_gpio_multi_request(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+struct bcm_mini_adapter *Adapter)
{
struct bcm_gpio_multi_info gpio_multi_info[MAX_IDX];
struct bcm_gpio_multi_info *pgpio_multi_info =
@@ -784,7 +788,7 @@ static int bcm_char_ioctl_gpio_multi_request(void __user
*argp,
}
static int bcm_char_ioctl_gpio_mode_request(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
struct bcm_gpio_multi_mode gpio_multi_mode[MAX_IDX];
struct bcm_gpio_multi_mode *pgpio_multi_mode =
@@ -877,7 +881,7 @@ static int bcm_char_ioctl_gpio_mode_request(void __user
*argp,
}
static int bcm_char_ioctl_misc_request(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
struct bcm_ioctl_buffer IoBuffer;
PVOID pvBuffer = NULL;
@@ -959,7 +963,7 @@ static int bcm_char_ioctl_buffer_download_start(
}
static int bcm_char_ioctl_buffer_download(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
struct bcm_firmware_info *psFwInfo = NULL;
struct bcm_ioctl_buffer IoBuffer;
@@ -1044,7 +1048,7 @@ static int bcm_char_ioctl_buffer_download(void __user
*argp,
}
static int bcm_char_ioctl_buffer_download_stop(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
INT Status;
int timeout = 0;
@@ -1151,7 +1155,7 @@ static int bcm_char_ioctl_qos_threshold(ULONG arg,
}
static int bcm_char_ioctl_switch_transfer_mode(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
UINT uiData = 0;
@@ -1190,7 +1194,7 @@ static int bcm_char_ioctl_get_driver_version(void __user
*argp)
}
static int bcm_char_ioctl_get_current_status(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+struct bcm_mini_adapter *Adapter)
{
struct bcm_link_state link_state;
struct bcm_ioctl_buffer IoBuffer;
@@ -1221,7 +1225,7 @@ static int bcm_char_ioctl_get_current_status(void __user
*argp,
static int bcm_char_ioctl_set_mac_tracing(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+ struct bcm_mini_adapter *Adapter)
{
struct bcm_ioctl_buffer IoBuffer;
UINT tracing_flag;
@@ -1242,7 +1246,7 @@ static int bcm_char_ioctl_set_mac_tracing(void __user
*argp,
}
static int bcm_char_ioctl_get_dsx_indication(void __user *argp,
- struct bcm_mini_adapter *Adapter)
+
[PATCH 04/44] Staging: bcm: Bcmchar.c: Renamed variable "stNVMReadWrite" -> "nvm_rw"
Renamed variable "stNVMReadWrite" -> "nvm_rw" in
bcm_handle_nvm_read_cmd().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 8a07118..52f810d 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -4,7 +4,7 @@
static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad,
PUCHAR read_data,
- struct bcm_nvm_readwrite *stNVMReadWrite)
+ struct bcm_nvm_readwrite *nvm_rw)
{
INT Status = STATUS_FAILURE;
@@ -22,8 +22,8 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
}
Status = BeceemNVMRead(ad, (PUINT)read_data,
- stNVMReadWrite->uiOffset,
- stNVMReadWrite->uiNumBytes);
+ nvm_rw->uiOffset,
+ nvm_rw->uiNumBytes);
up(&ad->NVMRdmWrmLock);
if (Status != STATUS_SUCCESS) {
@@ -31,8 +31,7 @@ static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter
*ad,
return Status;
}
- if (copy_to_user(stNVMReadWrite->pBuffer, read_data,
- stNVMReadWrite->uiNumBytes)) {
+ if (copy_to_user(nvm_rw->pBuffer, read_data, nvm_rw->uiNumBytes)) {
kfree(read_data);
return -EFAULT;
}
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 02/44] Staging: bcm: Bcmchar.c: Renamed variable "Adapter" -> "ad"
Renamed variable "Adapter" -> "ad" in bcm_handle_nvm_read_cmd().
Signed-off-by: Matthias Beyer
---
drivers/staging/bcm/Bcmchar.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index aff21d0..4b02a41 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -2,29 +2,29 @@
#include "headers.h"
-static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *Adapter,
+static int bcm_handle_nvm_read_cmd(struct bcm_mini_adapter *ad,
PUCHAR pReadData,
struct bcm_nvm_readwrite *stNVMReadWrite)
{
INT Status = STATUS_FAILURE;
- down(&Adapter->NVMRdmWrmLock);
+ down(&ad->NVMRdmWrmLock);
- if ((Adapter->IdleMode == TRUE) || (Adapter->bShutStatus == TRUE) ||
- (Adapter->bPreparingForLowPowerMode == TRUE)) {
+ if ((ad->IdleMode == TRUE) || (ad->bShutStatus == TRUE) ||
+ (ad->bPreparingForLowPowerMode == TRUE)) {
- BCM_DEBUG_PRINT(Adapter,
+ BCM_DEBUG_PRINT(ad,
DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL,
"Device is in Idle/Shutdown Mode\n");
- up(&Adapter->NVMRdmWrmLock);
+ up(&ad->NVMRdmWrmLock);
kfree(pReadData);
return -EACCES;
}
- Status = BeceemNVMRead(Adapter, (PUINT)pReadData,
+ Status = BeceemNVMRead(ad, (PUINT)pReadData,
stNVMReadWrite->uiOffset,
stNVMReadWrite->uiNumBytes);
- up(&Adapter->NVMRdmWrmLock);
+ up(&ad->NVMRdmWrmLock);
if (Status != STATUS_SUCCESS) {
kfree(pReadData);
--
2.0.3
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: media: as102: replace custom dprintk() with dev_dbg()
remove dprintk() and replace it with dev_dbg() in order to
use the common kernel coding style.
Signed-off-by: Martin Kepplinger
---
I don't have the device but this builds.
I think this is ok when it gets reviewed.
applies to -next20140801
drivers/staging/media/as102/as102_drv.c | 15 +
drivers/staging/media/as102/as102_drv.h |7 -
drivers/staging/media/as102/as102_fe.c | 44 +++
drivers/staging/media/as102/as102_usb_drv.c | 41 ++---
4 files changed, 62 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/media/as102/as102_drv.c
b/drivers/staging/media/as102/as102_drv.c
index 09d64cd..e0ee618 100644
--- a/drivers/staging/media/as102/as102_drv.c
+++ b/drivers/staging/media/as102/as102_drv.c
@@ -31,10 +31,6 @@
#include "as102_fw.h"
#include "dvbdev.h"
-int as102_debug;
-module_param_named(debug, as102_debug, int, 0644);
-MODULE_PARM_DESC(debug, "Turn on/off debugging (default: off)");
-
int dual_tuner;
module_param_named(dual_tuner, dual_tuner, int, 0644);
MODULE_PARM_DESC(dual_tuner, "Activate Dual-Tuner config (default: off)");
@@ -74,7 +70,8 @@ static void as102_stop_stream(struct as102_dev_t *dev)
return;
if (as10x_cmd_stop_streaming(bus_adap) < 0)
- dprintk(debug, "as10x_cmd_stop_streaming failed\n");
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+ "as10x_cmd_stop_streaming failed\n");
mutex_unlock(&dev->bus_adap.lock);
}
@@ -112,14 +109,16 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
int ret = -EFAULT;
if (mutex_lock_interruptible(&dev->bus_adap.lock)) {
- dprintk(debug, "mutex_lock_interruptible(lock) failed !\n");
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+ "amutex_lock_interruptible(lock) failed !\n");
return -EBUSY;
}
switch (onoff) {
case 0:
ret = as10x_cmd_del_PID_filter(bus_adap, (uint16_t) pid);
- dprintk(debug, "DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n",
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+ "DEL_PID_FILTER([%02d] 0x%04x) ret = %d\n",
index, pid, ret);
break;
case 1:
@@ -131,7 +130,7 @@ static int as10x_pid_filter(struct as102_dev_t *dev,
filter.pid = pid;
ret = as10x_cmd_add_PID_filter(bus_adap, &filter);
- dprintk(debug,
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
"ADD_PID_FILTER([%02d -> %02d], 0x%04x) ret = %d\n",
index, filter.idx, filter.pid, ret);
break;
diff --git a/drivers/staging/media/as102/as102_drv.h
b/drivers/staging/media/as102/as102_drv.h
index a06837d..49d0c42 100644
--- a/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@ -27,17 +27,10 @@
#define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
#define DRIVER_NAME "as10x_usb"
-extern int as102_debug;
#define debug as102_debug
extern struct usb_driver as102_usb_driver;
extern int elna_enable;
-#define dprintk(debug, args...) \
- do { if (debug) { \
- pr_debug("%s: ", __func__); \
- printk(args); \
- } } while (0)
-
#define AS102_DEVICE_MAJOR 192
#define AS102_USB_BUF_SIZE 512
diff --git a/drivers/staging/media/as102/as102_fe.c
b/drivers/staging/media/as102/as102_fe.c
index b686b76..69ffd51 100644
--- a/drivers/staging/media/as102/as102_fe.c
+++ b/drivers/staging/media/as102/as102_fe.c
@@ -46,7 +46,8 @@ static int as102_fe_set_frontend(struct dvb_frontend *fe)
/* send abilis command: SET_TUNE */
ret = as10x_cmd_set_tune(&dev->bus_adap, &tune_args);
if (ret != 0)
- dprintk(debug, "as10x_cmd_set_tune failed. (err = %d)\n", ret);
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+ "as10x_cmd_set_tune failed. (err = %d)\n", ret);
mutex_unlock(&dev->bus_adap.lock);
@@ -82,10 +83,17 @@ static int as102_fe_get_tune_settings(struct dvb_frontend
*fe,
struct dvb_frontend_tune_settings *settings) {
#if 0
- dprintk(debug, "step_size= %d\n", settings->step_size);
- dprintk(debug, "max_drift= %d\n", settings->max_drift);
- dprintk(debug, "min_delay_ms = %d -> %d\n", settings->min_delay_ms,
- 1000);
+ struct as102_dev_t *dev;
+
+ dev = (struct as102_dev_t *) fe->tuner_priv;
+ if (dev == NULL)
+ return -EINVAL;
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+ "step_size= %d\n", settings->step_size);
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+ "max_drift= %d\n", settings->max_drift);
+ dev_dbg(&dev->bus_adap.usb_dev->dev,
+
Re: [PATCH] staging: iio: ad9832: Use devm_iio_device_register
On August 3, 2014 11:45:00 AM GMT+01:00, Julia Lawall wrote: > > >On Sun, 3 Aug 2014, Jonathan Cameron wrote: > >> >> >> On August 3, 2014 10:56:58 AM GMT+01:00, Himangi Saraogi > wrote: >> >This patch introduces the use of devm_iio_device_register and does >away >> >with the unregister in the remove function. >> > >> And changes the resulting ordering so the regulator disable occurs >before the user >> space interface has been removed by the unregister. >> >> Please be very wary of using devm_iio_register. It is only correct if >the remove function does nothing else. > >I wonder if there could be a way to document these constraints? Perhaps though the simple rule of not doing anything that results in the remove sequence not being the mirror image of the probe covers most cases. Whilst there are safe ways to break this rule they make the code less obviously correct and so arguably should not be used anyway. > >julia > >> Jonathan >> >Signed-off-by: Himangi Saraogi >> >Acked-by: Julia Lawall >> >--- >> > drivers/staging/iio/frequency/ad9832.c | 3 +-- >> > 1 file changed, 1 insertion(+), 2 deletions(-) >> > >> >diff --git a/drivers/staging/iio/frequency/ad9832.c >> >b/drivers/staging/iio/frequency/ad9832.c >> >index cf68159..8a72c78 100644 >> >--- a/drivers/staging/iio/frequency/ad9832.c >> >+++ b/drivers/staging/iio/frequency/ad9832.c >> >@@ -304,7 +304,7 @@ static int ad9832_probe(struct spi_device *spi) >> >if (ret) >> >goto error_disable_reg; >> > >> >- ret = iio_device_register(indio_dev); >> >+ ret = devm_iio_device_register(&spi->dev, indio_dev); >> >if (ret) >> >goto error_disable_reg; >> > >> >@@ -322,7 +322,6 @@ static int ad9832_remove(struct spi_device *spi) >> >struct iio_dev *indio_dev = spi_get_drvdata(spi); >> >struct ad9832_state *st = iio_priv(indio_dev); >> > >> >- iio_device_unregister(indio_dev); >> >if (!IS_ERR(st->reg)) >> >regulator_disable(st->reg); >> > >> >> -- >> Sent from my Android phone with K-9 Mail. Please excuse my brevity. >> -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: iio: ad9832: Use devm_iio_device_register
On Sun, 3 Aug 2014, Jonathan Cameron wrote: > > > On August 3, 2014 10:56:58 AM GMT+01:00, Himangi Saraogi > wrote: > >This patch introduces the use of devm_iio_device_register and does away > >with the unregister in the remove function. > > > And changes the resulting ordering so the regulator disable occurs before the > user > space interface has been removed by the unregister. > > Please be very wary of using devm_iio_register. It is only correct if the > remove function does nothing else. I wonder if there could be a way to document these constraints? julia > Jonathan > >Signed-off-by: Himangi Saraogi > >Acked-by: Julia Lawall > >--- > > drivers/staging/iio/frequency/ad9832.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > >diff --git a/drivers/staging/iio/frequency/ad9832.c > >b/drivers/staging/iio/frequency/ad9832.c > >index cf68159..8a72c78 100644 > >--- a/drivers/staging/iio/frequency/ad9832.c > >+++ b/drivers/staging/iio/frequency/ad9832.c > >@@ -304,7 +304,7 @@ static int ad9832_probe(struct spi_device *spi) > > if (ret) > > goto error_disable_reg; > > > >-ret = iio_device_register(indio_dev); > >+ret = devm_iio_device_register(&spi->dev, indio_dev); > > if (ret) > > goto error_disable_reg; > > > >@@ -322,7 +322,6 @@ static int ad9832_remove(struct spi_device *spi) > > struct iio_dev *indio_dev = spi_get_drvdata(spi); > > struct ad9832_state *st = iio_priv(indio_dev); > > > >-iio_device_unregister(indio_dev); > > if (!IS_ERR(st->reg)) > > regulator_disable(st->reg); > > > > -- > Sent from my Android phone with K-9 Mail. Please excuse my brevity. > ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] staging: iio: ad9832: Use devm_iio_device_register
On August 3, 2014 10:56:58 AM GMT+01:00, Himangi Saraogi wrote: >This patch introduces the use of devm_iio_device_register and does away >with the unregister in the remove function. > And changes the resulting ordering so the regulator disable occurs before the user space interface has been removed by the unregister. Please be very wary of using devm_iio_register. It is only correct if the remove function does nothing else. Jonathan >Signed-off-by: Himangi Saraogi >Acked-by: Julia Lawall >--- > drivers/staging/iio/frequency/ad9832.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > >diff --git a/drivers/staging/iio/frequency/ad9832.c >b/drivers/staging/iio/frequency/ad9832.c >index cf68159..8a72c78 100644 >--- a/drivers/staging/iio/frequency/ad9832.c >+++ b/drivers/staging/iio/frequency/ad9832.c >@@ -304,7 +304,7 @@ static int ad9832_probe(struct spi_device *spi) > if (ret) > goto error_disable_reg; > >- ret = iio_device_register(indio_dev); >+ ret = devm_iio_device_register(&spi->dev, indio_dev); > if (ret) > goto error_disable_reg; > >@@ -322,7 +322,6 @@ static int ad9832_remove(struct spi_device *spi) > struct iio_dev *indio_dev = spi_get_drvdata(spi); > struct ad9832_state *st = iio_priv(indio_dev); > >- iio_device_unregister(indio_dev); > if (!IS_ERR(st->reg)) > regulator_disable(st->reg); > -- Sent from my Android phone with K-9 Mail. Please excuse my brevity. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: iio: ad9951: Use devm_iio_device_register
This patch introduces the use of devm_iio_device_register and does away
with the unregister in the remove function. The remove function is no
longer required and is completely removed.
Signed-off-by: Himangi Saraogi
Acked-by: Julia Lawall
---
drivers/staging/iio/frequency/ad9951.c | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9951.c
b/drivers/staging/iio/frequency/ad9951.c
index 5e8990a..d465db0 100644
--- a/drivers/staging/iio/frequency/ad9951.c
+++ b/drivers/staging/iio/frequency/ad9951.c
@@ -175,7 +175,7 @@ static int ad9951_probe(struct spi_device *spi)
idev->info = &ad9951_info;
idev->modes = INDIO_DIRECT_MODE;
- ret = iio_device_register(idev);
+ ret = devm_iio_device_register(&spi->dev, idev);
if (ret)
return ret;
spi->max_speed_hz = 200;
@@ -186,20 +186,12 @@ static int ad9951_probe(struct spi_device *spi)
return 0;
}
-static int ad9951_remove(struct spi_device *spi)
-{
- iio_device_unregister(spi_get_drvdata(spi));
-
- return 0;
-}
-
static struct spi_driver ad9951_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
},
.probe = ad9951_probe,
- .remove = ad9951_remove,
};
module_spi_driver(ad9951_driver);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging:iio:ad9852: Use devm_iio_device_register
This patch introduces the use of devm_iio_device_register and does away
with the unregister in the remove function.
Signed-off-by: Himangi Saraogi
Acked-by: Julia Lawall
---
drivers/staging/iio/frequency/ad9852.c | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/staging/iio/frequency/ad9852.c
b/drivers/staging/iio/frequency/ad9852.c
index 11e4367..af2f2cc 100644
--- a/drivers/staging/iio/frequency/ad9852.c
+++ b/drivers/staging/iio/frequency/ad9852.c
@@ -218,7 +218,7 @@ static int ad9852_probe(struct spi_device *spi)
idev->info = &ad9852_info;
idev->modes = INDIO_DIRECT_MODE;
- ret = iio_device_register(idev);
+ ret = devm_iio_device_register(&spi->dev, idev);
if (ret)
return ret;
spi->max_speed_hz = 200;
@@ -230,20 +230,12 @@ static int ad9852_probe(struct spi_device *spi)
return 0;
}
-static int ad9852_remove(struct spi_device *spi)
-{
- iio_device_unregister(spi_get_drvdata(spi));
-
- return 0;
-}
-
static struct spi_driver ad9852_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
},
.probe = ad9852_probe,
- .remove = ad9852_remove,
};
module_spi_driver(ad9852_driver);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: iio: ad9832: Use devm_iio_device_register
This patch introduces the use of devm_iio_device_register and does away with the unregister in the remove function. Signed-off-by: Himangi Saraogi Acked-by: Julia Lawall --- drivers/staging/iio/frequency/ad9832.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/iio/frequency/ad9832.c b/drivers/staging/iio/frequency/ad9832.c index cf68159..8a72c78 100644 --- a/drivers/staging/iio/frequency/ad9832.c +++ b/drivers/staging/iio/frequency/ad9832.c @@ -304,7 +304,7 @@ static int ad9832_probe(struct spi_device *spi) if (ret) goto error_disable_reg; - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(&spi->dev, indio_dev); if (ret) goto error_disable_reg; @@ -322,7 +322,6 @@ static int ad9832_remove(struct spi_device *spi) struct iio_dev *indio_dev = spi_get_drvdata(spi); struct ad9832_state *st = iio_priv(indio_dev); - iio_device_unregister(indio_dev); if (!IS_ERR(st->reg)) regulator_disable(st->reg); -- 1.9.1 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
