hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging/crystalhd: Fixes line over 80 characters warning in crystalhd_lnx.* 

Fixes the following checkpatch warning
WARNING: line over 80 characters

Signed-off-by: Amarjargal Gundjalam <amarjargal16@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Amarjargal Gundjalam 2013-05-12 20:43:09 -07:00 committed by Greg Kroah-Hartman
parent 3e4a7b8177
commit 9ebee9deb6
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/crystalhd/crystalhd_lnx.c
View File

@ -75,7 +75,8 @@ 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) struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp,
bool isr)
{ {
unsigned long flags = 0; unsigned long flags = 0;
struct crystalhd_ioctl_data *temp; struct crystalhd_ioctl_data *temp;
@ -95,8 +96,8 @@ struct crystalhd_ioctl_data *chd_dec_alloc_iodata(struct crystalhd_adp *adp, boo
return temp; return temp;
} }
void chd_dec_free_iodata(struct crystalhd_adp *adp, struct crystalhd_ioctl_data *iodata, void chd_dec_free_iodata(struct crystalhd_adp *adp,
bool isr) struct crystalhd_ioctl_data *iodata, bool isr)
{ {
unsigned long flags = 0; unsigned long flags = 0;
@ -109,7 +110,8 @@ void chd_dec_free_iodata(struct crystalhd_adp *adp, struct crystalhd_ioctl_data
spin_unlock_irqrestore(&adp->lock, flags); spin_unlock_irqrestore(&adp->lock, flags);
} }
static inline int crystalhd_user_data(unsigned long ud, void *dr, int size, int set) static inline int crystalhd_user_data(unsigned long ud, void *dr,
int size, int set)
{ {
int rc; int rc;
@ -131,8 +133,8 @@ static inline int crystalhd_user_data(unsigned long ud, void *dr, int size, int
return rc; return rc;
} }
static int chd_dec_fetch_cdata(struct crystalhd_adp *adp, struct crystalhd_ioctl_data *io, static int chd_dec_fetch_cdata(struct crystalhd_adp *adp,
uint32_t m_sz, unsigned long ua) struct crystalhd_ioctl_data *io, uint32_t m_sz, unsigned long ua)
{ {
unsigned long ua_off; unsigned long ua_off;
int rc = 0; int rc = 0;
@ -163,7 +165,7 @@ static int chd_dec_fetch_cdata(struct crystalhd_adp *adp, struct crystalhd_ioctl
} }
static int chd_dec_release_cdata(struct crystalhd_adp *adp, static int chd_dec_release_cdata(struct crystalhd_adp *adp,
struct crystalhd_ioctl_data *io, unsigned long ua) struct crystalhd_ioctl_data *io, unsigned long ua)
{ {
unsigned long ua_off; unsigned long ua_off;
int rc; int rc;
@ -178,8 +180,9 @@ static int chd_dec_release_cdata(struct crystalhd_adp *adp,
rc = crystalhd_user_data(ua_off, io->add_cdata, rc = crystalhd_user_data(ua_off, io->add_cdata,
io->add_cdata_sz, 1); io->add_cdata_sz, 1);
if (rc) { if (rc) {
BCMLOG_ERR("failed to push add_cdata sz:%x ua_off:%x\n", BCMLOG_ERR(
io->add_cdata_sz, (unsigned int)ua_off); "failed to push add_cdata sz:%x ua_off:%x\n",
io->add_cdata_sz, (unsigned int)ua_off);
return -ENODATA; return -ENODATA;
} }
} }
@ -378,8 +381,8 @@ static int chd_dec_init_chdev(struct crystalhd_adp *adp)
goto class_create_fail; goto class_create_fail;
} }
dev = device_create(crystalhd_class, NULL, MKDEV(adp->chd_dec_major, 0), dev = device_create(crystalhd_class, NULL,
NULL, "crystalhd"); MKDEV(adp->chd_dec_major, 0), NULL, "crystalhd");
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
rc = PTR_ERR(dev); rc = PTR_ERR(dev);
BCMLOG_ERR("failed to create device\n"); BCMLOG_ERR("failed to create device\n");
@ -394,7 +397,8 @@ static int chd_dec_init_chdev(struct crystalhd_adp *adp)
/* Allocate general purpose ioctl pool. */ /* Allocate general purpose ioctl pool. */
for (i = 0; i < CHD_IODATA_POOL_SZ; i++) { for (i = 0; i < CHD_IODATA_POOL_SZ; i++) {
temp = kzalloc(sizeof(struct crystalhd_ioctl_data), GFP_KERNEL); temp = kzalloc(sizeof(struct crystalhd_ioctl_data),
GFP_KERNEL);
if (!temp) { if (!temp) {
BCMLOG_ERR("ioctl data pool kzalloc failed\n"); BCMLOG_ERR("ioctl data pool kzalloc failed\n");
rc = -ENOMEM; rc = -ENOMEM;

4
drivers/staging/crystalhd/crystalhd_lnx.h
View File

@ -77,8 +77,8 @@ struct crystalhd_adp {
int chd_dec_major; int chd_dec_major;
unsigned int cfg_users; unsigned int cfg_users;
struct crystalhd_ioctl_data *idata_free_head; /* ioctl data pool */ struct crystalhd_ioctl_data *idata_free_head; /* ioctl data pool */
struct crystalhd_elem *elem_pool_head; /* Queue element pool */ struct crystalhd_elem *elem_pool_head; /* Queue element pool */
struct crystalhd_cmd cmds; struct crystalhd_cmd cmds;