Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751580AbaFBFEr (ORCPT ); Mon, 2 Jun 2014 01:04:47 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:42828 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751109AbaFBFEq (ORCPT ); Mon, 2 Jun 2014 01:04:46 -0400 Date: Mon, 2 Jun 2014 14:03:58 +0900 From: Daeseok Youn To: lidza.louina@gmail.com, gregkh@linuxfoundation.org Cc: markh@compro.net, dan.carpenter@oracle.com, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/6 RESEND] staging: dgap: remove useless dgap_probe1() function Message-ID: <20140602050358.GA29799@devel.8.8.4.4> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- RESEND : this patch is included into newly serise of patches so renumbered and resend. drivers/staging/dgap/dgap.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c index 170d6f3..af78f6f 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 */ -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/