From: Daeseok Youn Date: Thu, 29 May 2014 09:10:27 +0000 (+0900) Subject: staging: dgap: remove useless dgap_probe1() function X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=836bf241d8062490698e9238e805f7847f3fb179;p=deliverable%2Flinux.git staging: dgap: remove useless dgap_probe1() function The dgap_probe1() function is just calling dgap_found_board(). So it is removed and dgap_found_board() is called directly. Signed-off-by: Daeseok Youn Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 170d6f3e4221..af78f6f057a9 100644 --- a/drivers/staging/dgap/dgap.c +++ b/drivers/staging/dgap/dgap.c @@ -76,7 +76,6 @@ static void dgap_poll_handler(ulong dummy); static int dgap_init_pci(void); 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 int dgap_probe1(struct pci_dev *pdev, int card_type); static int dgap_do_remap(struct board_t *brd); static irqreturn_t dgap_intr(int irq, void *voidbrd); @@ -577,7 +576,7 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (rc) return -EIO; - rc = dgap_probe1(pdev, ent->driver_data); + rc = dgap_found_board(pdev, ent->driver_data); if (rc) return rc; @@ -585,11 +584,6 @@ static int dgap_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) return dgap_firmware_load(pdev, ent->driver_data); } -static int dgap_probe1(struct pci_dev *pdev, int card_type) -{ - return dgap_found_board(pdev, card_type); -} - static void dgap_remove_one(struct pci_dev *dev) { /* Do Nothing */