From patchwork Sun Oct 15 21:00:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 826051 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PJZTlmCl"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yFYlV6x5nz9sDB for ; Mon, 16 Oct 2017 08:01:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751504AbdJOVA7 (ORCPT ); Sun, 15 Oct 2017 17:00:59 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34986 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbdJOVA5 (ORCPT ); Sun, 15 Oct 2017 17:00:57 -0400 Received: by mail-wm0-f67.google.com with SMTP id b189so6152838wmd.2; Sun, 15 Oct 2017 14:00:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=laFE7HEVpd7Mi9xm7tkD3RW9NyOiS2n+Et6dwBPu+9U=; b=PJZTlmClbIKOxBtvFLlO4mARDtKscDz5j7pTZWrpWZ5DFljMtHg3McAzXwUTLV2sYS +FAocIn0ptDsyk2hrpeQBSiBl7oMKMroO1mwEZRKfu7+ntFNI3qgRGjl7ZwsUHtyMyKI oWK9NS9P8aaszwj48K2LF6WXp51BJzcUWjarE50SwA2itQH54bAy+r3Ij8Xn2KutLRBq L6jD1UshOpZ/PNIKI5YT0l2TeBxbgyhPWD4V3kksmd/xzNUQjX3m6JLosST7WLOlNwae vu4jTRq8/l/GBru35QjdHGJVUFPL3sWqGCt+r+rzYBRf69dXdnAzjfSk/7Lf1lmnQ6PD S31A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=laFE7HEVpd7Mi9xm7tkD3RW9NyOiS2n+Et6dwBPu+9U=; b=rowXKXk4uHudAbmwiLje9sIm8t4Kzsh3Omf2bcLfa40wenlbxjALQkMPrL//nNNMxg wz5kOKE2I3ZbzA/J6K/ZYgDxSFKz4igdMd2ZScIHEyGL4w9No+Wn3znkvZR+f67fh84j u/mIDbkDCkq51DwkqaeYDrj6vjQw8kYTJvzaRjo+QAr/W4iQltcOgZIXCpi47wP+GYlA Sq1QjXUzCQbxcN/sx71X6yEMbXRX9hbflWYWDfGTqPjL9XFgOnOwAWpXBvGWQZHMSjTC V5lYXsBrajpGnwC5jCTyLHpthJaY0dseVE6VRaZqf12TM2xzrpJ+m+SPbSPNIDsW8TqA SMwg== X-Gm-Message-State: AMCzsaUHTckAu/ncMJntO5lt6lPiWbm9x4sEcL+UBf9yDB+IJuJfYtkp rbXUNCPyVkbQj1Nr2fIu4Oo= X-Google-Smtp-Source: AOwi7QDEhHF/bGRXsOO58UmKM6U5pcujunuku0KqyBsxhQV2oRoD0kqPC0CKeEiLH2gYaIgXuM/F9A== X-Received: by 10.223.164.2 with SMTP id d2mr7144284wra.103.1508101256445; Sun, 15 Oct 2017 14:00:56 -0700 (PDT) Received: from localhost.localdomain (cpc101300-bagu16-2-0-cust362.1-3.cable.virginm.net. [86.21.41.107]) by smtp.gmail.com with ESMTPSA id x75sm6551879wme.3.2017.10.15.14.00.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 15 Oct 2017 14:00:55 -0700 (PDT) From: Sudip Mukherjee To: "David S. Miller" , Thomas Sailer Cc: linux-kernel@vger.kernel.org, linux-hams@vger.kernel.org, netdev@vger.kernel.org, Sudip Mukherjee Subject: [PATCH] hamradio: baycom_par: use new parport device model Date: Sun, 15 Oct 2017 22:00:52 +0100 Message-Id: <1508101252-14268-1-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Modify baycom driver to use the new parallel port device model. Signed-off-by: Sudip Mukherjee --- Not tested on real hardware, only tested on kvm with 32 bit guest and verified that the device is binding to the driver properly in par96_open but then unbinding as the device was not found. drivers/net/hamradio/baycom_par.c | 48 +++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c index e178383..1f7ceaf 100644 --- a/drivers/net/hamradio/baycom_par.c +++ b/drivers/net/hamradio/baycom_par.c @@ -311,7 +311,9 @@ static void par96_wakeup(void *handle) static int par96_open(struct net_device *dev) { struct baycom_state *bc = netdev_priv(dev); + struct pardev_cb par_cb; struct parport *pp; + int i; if (!dev || !bc) return -ENXIO; @@ -332,8 +334,21 @@ static int par96_open(struct net_device *dev) } memset(&bc->modem, 0, sizeof(bc->modem)); bc->hdrv.par.bitrate = 9600; - bc->pdev = parport_register_device(pp, dev->name, NULL, par96_wakeup, - par96_interrupt, PARPORT_DEV_EXCL, dev); + memset(&par_cb, 0, sizeof(par_cb)); + par_cb.wakeup = par96_wakeup; + par_cb.irq_func = par96_interrupt; + par_cb.private = (void *)dev; + par_cb.flags = PARPORT_DEV_EXCL; + for (i = 0; i < NR_PORTS; i++) + if (baycom_device[i] == dev) + break; + + if (i == NR_PORTS) { + pr_err("%s: no device found\n", bc_drvname); + parport_put_port(pp); + return -ENODEV; + } + bc->pdev = parport_register_dev_model(pp, dev->name, &par_cb, i); parport_put_port(pp); if (!bc->pdev) { printk(KERN_ERR "baycom_par: cannot register parport at 0x%lx\n", dev->base_addr); @@ -490,12 +505,34 @@ static int baycom_ioctl(struct net_device *dev, struct ifreq *ifr, /* --------------------------------------------------------------------- */ +static int baycom_par_probe(struct pardevice *par_dev) +{ + struct device_driver *drv = par_dev->dev.driver; + int len = strlen(drv->name); + + if (strncmp(par_dev->name, drv->name, len)) + return -ENODEV; + + return 0; +} + +static struct parport_driver baycom_par_driver = { + .name = "bcp", + .probe = baycom_par_probe, + .devmodel = true, +}; + static int __init init_baycompar(void) { - int i, found = 0; + int i, found = 0, ret; char set_hw = 1; printk(bc_drvinfo); + + ret = parport_register_driver(&baycom_par_driver); + if (ret) + return ret; + /* * register net devices */ @@ -524,8 +561,10 @@ static int __init init_baycompar(void) baycom_device[i] = dev; } - if (!found) + if (!found) { + parport_unregister_driver(&baycom_par_driver); return -ENXIO; + } return 0; } @@ -539,6 +578,7 @@ static void __exit cleanup_baycompar(void) if (dev) hdlcdrv_unregister(dev); } + parport_unregister_driver(&baycom_par_driver); } module_init(init_baycompar);