Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752486Ab3FYX7y (ORCPT ); Tue, 25 Jun 2013 19:59:54 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:48016 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752231Ab3FYX7w (ORCPT ); Tue, 25 Jun 2013 19:59:52 -0400 From: Chad Williamson To: gregkh@linuxfoundation.org Cc: puff65537@bansheeslibrary.com, viro@zeniv.linux.org.uk, tulinizer@gmail.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, Chad Williamson Subject: [PATCH v2 5/6] Staging: silicom: remove the typedef for bpmod_info_t Date: Tue, 25 Jun 2013 18:59:23 -0500 Message-Id: <1372204764-16203-2-git-send-email-chad@dahc.us> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1372204764-16203-1-git-send-email-chad@dahc.us> References: <1372204764-16203-1-git-send-email-chad@dahc.us> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1741 Lines: 58 Remove the bpmod_info_t typedef from bpctl_mod.c, replacing it with struct bpmod_info. Signed-off-by: Chad Williamson --- v2: rebased onto latest master in linux-next --- drivers/staging/silicom/bpctl_mod.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/silicom/bpctl_mod.c b/drivers/staging/silicom/bpctl_mod.c index 4689076..91c864c 100644 --- a/drivers/staging/silicom/bpctl_mod.c +++ b/drivers/staging/silicom/bpctl_mod.c @@ -5971,7 +5971,7 @@ enum board_type { PE210G2BPi40, }; -typedef struct _bpmod_info_t { +struct bpmod_info { unsigned int vendor; unsigned int device; unsigned int subvendor; @@ -5979,7 +5979,7 @@ typedef struct _bpmod_info_t { unsigned int index; char *bp_name; -} bpmod_info_t; +}; typedef struct _dev_desc { char *name; @@ -6155,7 +6155,7 @@ dev_desc_t dev_desc[] = { {0}, }; -static bpmod_info_t tx_ctl_pci_tbl[] = { +static struct bpmod_info tx_ctl_pci_tbl[] = { {0x8086, 0x107a, SILICOM_SVID, SILICOM_PXG2BPFI_SSID, PXG2BPFI, "PXG2BPFI-SD"}, {0x8086, 0x107a, SILICOM_SVID, SILICOM_PXG2BPFIL_SSID, PXG2BPFIL, @@ -6653,7 +6653,7 @@ static void find_fw(struct bpctl_dev *dev) printk("firmware version: 0x%x\n", dev->bp_fw_ver); } -static int init_one(struct bpctl_dev *dev, bpmod_info_t *info, struct pci_dev *pdev1) +static int init_one(struct bpctl_dev *dev, struct bpmod_info *info, struct pci_dev *pdev1) { unsigned long mmio_start, mmio_len; -- 1.8.1.4 -- 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/