projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
drivers
/
staging
/
crystalhd
/
crystalhd_lnx.c
diff --git
a/drivers/staging/crystalhd/crystalhd_lnx.c
b/drivers/staging/crystalhd/crystalhd_lnx.c
index
b17fbf8
..
190b9b9
100644
(file)
--- a/
drivers/staging/crystalhd/crystalhd_lnx.c
+++ b/
drivers/staging/crystalhd/crystalhd_lnx.c
@@
-75,8
+75,9
@@
static int chd_dec_disable_int(struct crystalhd_adp *adp)
return 0;
}
return 0;
}
-struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
- bool isr)
+static struct
+crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
+ bool isr)
{
unsigned long flags = 0;
struct crystalhd_ioctl_data *temp;
{
unsigned long flags = 0;
struct crystalhd_ioctl_data *temp;
@@
-96,8
+97,8
@@
struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
return temp;
}
return temp;
}
-void chd_dec_free_iodata(struct crystalhd_adp *adp,
- struct crystalhd_ioctl_data *iodata, bool isr)
+
static
void chd_dec_free_iodata(struct crystalhd_adp *adp,
+
struct crystalhd_ioctl_data *iodata, bool isr)
{
unsigned long flags = 0;
{
unsigned long flags = 0;
@@
-156,7
+157,7
@@
static int chd_dec_fetch_cdata(struct crystalhd_adp *adp,
if (rc) {
BCMLOG_ERR("failed to pull add_cdata sz:%x ua_off:%x\n",
io->add_cdata_sz, (unsigned int)ua_off);
if (rc) {
BCMLOG_ERR("failed to pull add_cdata sz:%x ua_off:%x\n",
io->add_cdata_sz, (unsigned int)ua_off);
-
k
free(io->add_cdata);
+
v
free(io->add_cdata);
io->add_cdata = NULL;
return -ENODATA;
}
io->add_cdata = NULL;
return -ENODATA;
}
@@
-627,7
+628,7
@@
err:
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
-int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
+
static
int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct crystalhd_adp *adp;
struct crystalhd_ioctl_data *temp;
{
struct crystalhd_adp *adp;
struct crystalhd_ioctl_data *temp;
@@
-661,7
+662,7
@@
int chd_dec_pci_suspend(struct pci_dev *pdev, pm_message_t state)
return 0;
}
return 0;
}
-int chd_dec_pci_resume(struct pci_dev *pdev)
+
static
int chd_dec_pci_resume(struct pci_dev *pdev)
{
struct crystalhd_adp *adp;
enum BC_STATUS sts = BC_STS_SUCCESS;
{
struct crystalhd_adp *adp;
enum BC_STATUS sts = BC_STS_SUCCESS;