From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1517181736; cv=none; d=google.com; s=arc-20160816; b=p2/cUaZMkI7TSHTWwzeAfPOdmjWmKiK0hEtbLgL3LVT6w9DgC30PcMkOaaV5VdznPa 2yjXayF1aEYU2/BgSgD01jA1VmZPNARA6JkBo43PY9l9ADixtPtiQ24zaiMfNcWXvtM4 OhzG+p2kENC4DTl+QuGzO2S0bRgojoL4jC+/pRsXlLcRPhGwOE2nmzX2XSUY0rCx2AHb jMRALcbU0g7IA09bk8fCtnwcoEmCrqm0N5wA5y2AGjggrNOVe301gxU9hyCxwrsThTdO NNZKNUXkkeRKIhl38/z+RjKvzBEMqQCTyH4H6u9uGmUE3DgQq9eesIl/3b99rnJdfhSz PTjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=hn5N9XloWTv9Zq4BTeBQHtTr0qKlmbEeALF0P6B6G04=; b=UoIhkG10kCHDW5jSz2v+WRF0SB1BRdtQTKS/0FtR7jimEjL0iRY5xsHTv93GZmsmBL cmTFQrcDwKdL1iqHtZgb3wv7Bz5014amoTrlYKh26XUPDBXOFxqHlkVJYsHz2rKoRrok WvJ77SaENT8hJB/1IbddtropP0jWx1wVrMNEfHRsmFCT8F3DhvX7KCthqbfS1dfDjDKL VFWxE7+CHe6ZLjeKLG7azmInXUn0aLbj+/gNQ9UhNPcU9ApTajzrVldp785/2dvwtXWb X4R4q9csKBxQ6gh6p4+mHlF2F1W5eMcYw+Zgsc3dRR18Vrie8Pm+CDZnB+KEjjKSDb0P 8vgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gEeu4USI; spf=pass (google.com: domain of sudipm.mukherjee@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=sudipm.mukherjee@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=gEeu4USI; spf=pass (google.com: domain of sudipm.mukherjee@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=sudipm.mukherjee@gmail.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com X-Google-Smtp-Source: AH8x224DnZDuM1BL0s58T1YYntQNWE8Qc/XTU3nbX7NMaLMQIglrcLHMSYg1RU3BwZ+WXpnlAFgAmg== From: Sudip Mukherjee To: Greg Kroah-Hartman , Rodolfo Giometti Cc: linux-kernel@vger.kernel.org, Sudip Mukherjee Subject: [PATCH 2/2] pps: generator: use new parport device model Date: Sun, 28 Jan 2018 23:22:09 +0000 Message-Id: <1517181729-5839-2-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1517181729-5839-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1517181729-5839-1-git-send-email-sudipm.mukherjee@gmail.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590880356854811692?= X-GMAIL-MSGID: =?utf-8?q?1590880356854811692?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Modify pps generator driver to use the new parallel port device model. Signed-off-by: Sudip Mukherjee Acked-by: Rodolfo Giometti --- Tested on qemu with two parallel ports. drivers/pps/generators/pps_gen_parport.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/pps/generators/pps_gen_parport.c b/drivers/pps/generators/pps_gen_parport.c index dcd39fb..99b076c 100644 --- a/drivers/pps/generators/pps_gen_parport.c +++ b/drivers/pps/generators/pps_gen_parport.c @@ -192,13 +192,18 @@ static inline ktime_t next_intr_time(struct pps_generator_pp *dev) static void parport_attach(struct parport *port) { + struct pardev_cb pps_cb; + if (attached) { /* we already have a port */ return; } - device.pardev = parport_register_device(port, KBUILD_MODNAME, - NULL, NULL, NULL, PARPORT_FLAG_EXCL, &device); + memset(&pps_cb, 0, sizeof(pps_cb)); + pps_cb.private = &device; + pps_cb.flags = PARPORT_FLAG_EXCL; + device.pardev = parport_register_dev_model(port, KBUILD_MODNAME, + &pps_cb, 0); if (!device.pardev) { pr_err("couldn't register with %s\n", port->name); return; @@ -236,8 +241,9 @@ static void parport_detach(struct parport *port) static struct parport_driver pps_gen_parport_driver = { .name = KBUILD_MODNAME, - .attach = parport_attach, + .match_port = parport_attach, .detach = parport_detach, + .devmodel = true, }; /* module staff */ -- 1.9.1