staging: dgap: make dgap_found_board() return a brd pointer
PATCH v2 1/1 staging: dgap: make dgap_found_board() return a brd pointer
Make dgap_found_board() return a brd pointer and that brd pointer assign to dgap_board[] in the end of the dgap_init_one().
Signed-off-by Daeseok Youn <[email protected]>
---
V2: change return value properly.
update error handling, if one of functions in dgap_init_one() is failed, do not need to set dgap_board[] to NULL.
drivers/staging/dgap/dgap.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/staging/dgap/dgap.c +13 -13
@@ -70,7 +70,8 @@ MODULE_SUPPORTED_DEVICE("dgap");static int dgap_start (void );static void dgap_init_globals (void ); -static int dgap_found_board (struct pci_dev *pdev,int id,int boardnum); +static struct board_t *dgap_found_board (struct pci_dev *pdev,int id, +int boardnum);static void dgap_cleanup_board (struct board_t *brd);static void dgap_poll_handler (ulong dummy);static int dgap_init_pci (void );
@@ -582,11 +583,10 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (rc)return -EIO ; - rc =dgap_found_board (pdev, ent->driver_data, dgap_numboards); -if (rc) -return rc; + brd =dgap_found_board (pdev, ent->driver_data, dgap_numboards); +if (IS_ERR (brd)) +return PTR_ERR (brd); - brd = dgap_board[dgap_numboards++]; rc =dgap_firmware_load (pdev, ent->driver_data, brd);if (rc) goto cleanup_brd;
@@ -617,6 +617,8 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) brd->state =BOARD_READY ; brd->dpastatus =BD_RUNNING ; + dgap_board[dgap_numboards++] = brd; +return 0 ; tty_free:
@@ -630,7 +632,7 @@ free_flipbuf: cleanup_brd:dgap_release_remap (brd);kfree (brd); - dgap_board[--dgap_numboards] =NULL ; +return rc; }
@@ -717,7 +719,8 @@ static void dgap_cleanup_board(struct board_t *brd)* * A board has been found, init it. */ -static int dgap_found_board (struct pci_dev *pdev,int id,int boardnum) +static struct board_t *dgap_found_board (struct pci_dev *pdev,int id, +int boardnum) {struct board_t *brd;unsigned int pci_irq;
@@ -727,9 +730,7 @@ static int dgap_found_board(struct pci_dev *pdev, int id, int boardnum)/* get the board structure and prep it */ brd =kzalloc (sizeof (struct board_t ),GFP_KERNEL );if (!brd) -return -ENOMEM ; - - dgap_board[boardnum] = brd; +return ERR_PTR (-ENOMEM );/* store the info for the board we've found */ brd->magic =DGAP_BOARD_MAGIC ;
@@ -828,13 +829,12 @@ static int dgap_found_board(struct pci_dev *pdev, int id, int boardnum)pr_info ("dgap: board %d: %s (rev %d), irq %ld\n" , boardnum, brd->name, brd->rev, brd->irq); -return 0 ; +return brd; free_brd:kfree (brd); - dgap_board[boardnum] =NULL ; -return ret; +return ERR_PTR (ret); }
Signature · 1 line
1.7.1
Quoted 4 lines · Daeseok Youn
Make
dgap_found_board()return a brd pointer and that brd pointer assign to dgap_board[] in the end of thedgap_init_one().Signed-off-by Daeseok Youn <[email protected]>
Looks nice, thanks.
Reviewed-by Dan Carpenter <[email protected]>
regards,
dan carpenter