openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: dgap: change function names properly 

dgap_do_remap() and dgap_release_remap() names could be
changed to dgap_remap() and dgap_unmap().

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daeseok Youn 2014-10-08 20:13:21 +09:00 committed by Greg Kroah-Hartman
parent 9f2b744475
commit 263bd1cb84
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/dgap/dgap.c
View File

@ -78,8 +78,8 @@ static void dgap_cleanup_board(struct board_t *brd);
static void dgap_poll_handler(ulong dummy); static void dgap_poll_handler(ulong dummy);
static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
static void dgap_remove_one(struct pci_dev *dev); static void dgap_remove_one(struct pci_dev *dev);
static int dgap_do_remap(struct board_t *brd); static int dgap_remap(struct board_t *brd);
static void dgap_release_remap(struct board_t *brd); static void dgap_unmap(struct board_t *brd);
static irqreturn_t dgap_intr(int irq, void *voidbrd); static irqreturn_t dgap_intr(int irq, void *voidbrd);
static int dgap_tty_open(struct tty_struct *tty, struct file *file); static int dgap_tty_open(struct tty_struct *tty, struct file *file);
@ -621,7 +621,7 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dgap_free_flipbuf(brd); dgap_free_flipbuf(brd);
cleanup_brd: cleanup_brd:
dgap_cleanup_nodes(); dgap_cleanup_nodes();
dgap_release_remap(brd); dgap_unmap(brd);
kfree(brd); kfree(brd);
return rc; return rc;
@ -683,7 +683,7 @@ static void dgap_cleanup_board(struct board_t *brd)
tasklet_kill(&brd->helper_tasklet); tasklet_kill(&brd->helper_tasklet);
dgap_release_remap(brd); dgap_unmap(brd);
/* Free all allocated channels structs */ /* Free all allocated channels structs */
for (i = 0; i < MAXPORTS ; i++) for (i = 0; i < MAXPORTS ; i++)
@ -804,7 +804,7 @@ static struct board_t *dgap_found_board(struct pci_dev *pdev, int id,
tasklet_init(&brd->helper_tasklet, dgap_poll_tasklet, tasklet_init(&brd->helper_tasklet, dgap_poll_tasklet,
(unsigned long) brd); (unsigned long) brd);
ret = dgap_do_remap(brd); ret = dgap_remap(brd);
if (ret) if (ret)
goto free_brd; goto free_brd;
@ -979,7 +979,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
/* /*
* Remap PCI memory. * Remap PCI memory.
*/ */
static int dgap_do_remap(struct board_t *brd) static int dgap_remap(struct board_t *brd)
{ {
if (!brd || brd->magic != DGAP_BOARD_MAGIC) if (!brd || brd->magic != DGAP_BOARD_MAGIC)
return -EIO; return -EIO;
@ -1011,7 +1011,7 @@ static int dgap_do_remap(struct board_t *brd)
return 0; return 0;
} }
static void dgap_release_remap(struct board_t *brd) static void dgap_unmap(struct board_t *brd)
{ {
iounmap(brd->re_map_port); iounmap(brd->re_map_port);
iounmap(brd->re_map_membase); iounmap(brd->re_map_membase);