From patchwork Sun Sep 17 11:46:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudip Mukherjee X-Patchwork-Id: 814643 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="IJGHLC5H"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xw6nr0MG0z9sDB for ; Sun, 17 Sep 2017 21:47:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751254AbdIQLq3 (ORCPT ); Sun, 17 Sep 2017 07:46:29 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35058 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803AbdIQLq1 (ORCPT ); Sun, 17 Sep 2017 07:46:27 -0400 Received: by mail-wr0-f196.google.com with SMTP id n64so3584174wrb.2; Sun, 17 Sep 2017 04:46:27 -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=AcX4mu4w7tBWxb+hanH1l04yYDD85/vQnXD0GWQ4y2o=; b=IJGHLC5HdOid6aBorTOoofYXs3Ikgp07JcrxZaSybOhcFxhMzgFChmCv8yLQVNTD+Q TTxvoe1mQGrYYKIjLKWJoVL5hgNUYTwW037FhnUv3Sx8tU6aYNEywH2H5MHeYT37s25n 5/nFkxLQO9M4WNdM47MFfaEaBVgn5aD1xqxu22EwDC/nDHZrwA7aXR2BDgmjdHS3LCIQ r/Dmg1dtLLYGS+elSIUbYC6R8SCpETAQozNIoc/KeYzWsay20X+axTTHyIPJt83DtW5t 3/a9W99v0AHJqYzvEn9kahceNJ53vlBdCmx/cfjlkfEJFpMOvsdIqcZ3wx8UXqmFDL00 qsXQ== 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=AcX4mu4w7tBWxb+hanH1l04yYDD85/vQnXD0GWQ4y2o=; b=oIwlc4vpXZvXrninsrkyqVL0nztB+aE+KU9xNDhZE/bfZr9JQKwKocYnU+J8nEpT11 n6GGM4VJwRLgoqnfTY0iCqoGm7/bWGK+qGwJHnLdxmr1d8Ao6E5g5N0rY8361GHTI4qR eFq2vSfgCzwGtiHecnUqpUK2RgCVyVzaKUaQ+FypsEjUv/T2MrBfbVCLMRMpFHQbv+Hc hjYSxYs7PfHNCy2tM8RoiVDmQ4mvaxnyTltvKcjb8JsdxcFuFBcoAW1bfPuYdhaFELjV Qq+SjQfPVk5KJJRfVSm38pyl21Wf0xQ/sb6cr3QAjJijHgI9nLViX+efv4xC7DDKe9JB zgrA== X-Gm-Message-State: AHPjjUixh7cDerEHUtVHMTTnAVYtZ71YKCpidEzQWjMNuucVJoR64PJc JOxWow1cM4/tpG7+ X-Google-Smtp-Source: ADKCNb6JWwUjE0Zm83y0Tiy0i8wLV6BcCe00lK5c1sa0yN6pwAabBhgu1kjXNd9+lU7uhCwshknOPw== X-Received: by 10.223.178.166 with SMTP id g35mr26889989wrd.262.1505648786226; Sun, 17 Sep 2017 04:46:26 -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 56sm4880596wrx.2.2017.09.17.04.46.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Sep 2017 04:46:25 -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: use new parport device model Date: Sun, 17 Sep 2017 12:46:20 +0100 Message-Id: <1505648780-4385-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 Acked-By: Thomas Sailer --- Not tested on real hardware, only tested on qemu and verified that the device is binding to the driver properly in epp_open but then unbinding as the device was not found. drivers/net/hamradio/baycom_epp.c | 50 +++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 1503f10..1e62d00 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -840,6 +840,7 @@ static int epp_open(struct net_device *dev) unsigned char tmp[128]; unsigned char stat; unsigned long tstart; + struct pardev_cb par_cb; if (!pp) { printk(KERN_ERR "%s: parport at 0x%lx unknown\n", bc_drvname, dev->base_addr); @@ -859,8 +860,21 @@ static int epp_open(struct net_device *dev) return -EIO; } memset(&bc->modem, 0, sizeof(bc->modem)); - bc->pdev = parport_register_device(pp, dev->name, NULL, epp_wakeup, - NULL, PARPORT_DEV_EXCL, dev); + memset(&par_cb, 0, sizeof(par_cb)); + par_cb.wakeup = epp_wakeup; + 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 "%s: cannot register parport at 0x%lx\n", bc_drvname, pp->base); @@ -1185,6 +1199,23 @@ MODULE_LICENSE("GPL"); /* --------------------------------------------------------------------- */ +static int baycom_epp_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_epp_par_driver = { + .name = "bce", + .probe = baycom_epp_par_probe, + .devmodel = true, +}; + static void __init baycom_epp_dev_setup(struct net_device *dev) { struct baycom_state *bc = netdev_priv(dev); @@ -1204,10 +1235,15 @@ static void __init baycom_epp_dev_setup(struct net_device *dev) static int __init init_baycomepp(void) { - int i, found = 0; + int i, found = 0, ret; char set_hw = 1; printk(bc_drvinfo); + + ret = parport_register_driver(&baycom_epp_par_driver); + if (ret) + return ret; + /* * register net devices */ @@ -1241,7 +1277,12 @@ static int __init init_baycomepp(void) found++; } - return found ? 0 : -ENXIO; + if (found == 0) { + parport_unregister_driver(&baycom_epp_par_driver); + return -ENXIO; + } + + return 0; } static void __exit cleanup_baycomepp(void) @@ -1260,6 +1301,7 @@ static void __exit cleanup_baycomepp(void) printk(paranoia_str, "cleanup_module"); } } + parport_unregister_driver(&baycom_epp_par_driver); } module_init(init_baycomepp);