From patchwork Sat Dec 1 11:07:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Shiyan X-Patchwork-Id: 203119 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7491D2C00A4 for ; Sat, 1 Dec 2012 22:07:59 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751510Ab2LALH5 (ORCPT ); Sat, 1 Dec 2012 06:07:57 -0500 Received: from fallback6.mail.ru ([94.100.176.134]:36348 "EHLO fallback6.mail.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751386Ab2LALHz (ORCPT ); Sat, 1 Dec 2012 06:07:55 -0500 Received: from smtp41.i.mail.ru (smtp41.i.mail.ru [94.100.177.101]) by fallback6.mail.ru (mPOP.Fallback_MX) with ESMTP id C09789C2928D for ; Sat, 1 Dec 2012 15:07:51 +0400 (MSK) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail; h=Message-Id:Date:Subject:Cc:To:From; bh=EwQUZGCvbboPcaoo9w+nh7COYD/t/mTHVd20fDxKzY4=; b=tFBVFRzq0RfHU3Y9p8hRoCgPp1P8x+FKksj74v6I53iZ1ErOmh1ZbZrXbjG2sRvxx9rKqD7JOKa0KtJz0lmjyRWMBkTQsXPl0ges8ipyiIMJr8xKz2+t4QPVmTv5sBO9; Received: from [188.134.40.128] (port=1651 helo=shc.zet) by smtp41.i.mail.ru with esmtpa (envelope-from ) id 1Tekuw-0004Yy-5f; Sat, 01 Dec 2012 15:07:30 +0400 From: Alexander Shiyan To: netdev@vger.kernel.org Cc: Samuel Ortiz , Arnd Bergmann , Alexander Shiyan Subject: [PATCH] irda: ep7211-sir: Convert to platform_diver Date: Sat, 1 Dec 2012 15:07:26 +0400 Message-Id: <1354360046-4818-1-git-send-email-shc_work@mail.ru> X-Mailer: git-send-email 1.7.8.6 X-Spam: Not detected X-Mras: Ok Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch converts ep7211-sir driver to platform_driver. Since driver can be used not only for EP7211 CPU, function names was be renamed to generic clps711x... Signed-off-by: Alexander Shiyan Acked-by: Arnd Bergmann --- drivers/net/irda/ep7211-sir.c | 73 +++++++++++++++-------------------------- 1 files changed, 27 insertions(+), 46 deletions(-) diff --git a/drivers/net/irda/ep7211-sir.c b/drivers/net/irda/ep7211-sir.c index f83c5b8..5fe1f4d 100644 --- a/drivers/net/irda/ep7211-sir.c +++ b/drivers/net/irda/ep7211-sir.c @@ -1,52 +1,18 @@ /* - * IR port driver for the Cirrus Logic EP7211 processor. + * IR port driver for the Cirrus Logic CLPS711X processors * * Copyright 2001, Blue Mug Inc. All rights reserved. * Copyright 2007, Samuel Ortiz */ -#include -#include -#include -#include -#include -#include -#include +#include +#include -#include #include #include "sir-dev.h" -#define MIN_DELAY 25 /* 15 us, but wait a little more to be sure */ -#define MAX_DELAY 10000 /* 1 ms */ - -static int ep7211_open(struct sir_dev *dev); -static int ep7211_close(struct sir_dev *dev); -static int ep7211_change_speed(struct sir_dev *dev, unsigned speed); -static int ep7211_reset(struct sir_dev *dev); - -static struct dongle_driver ep7211 = { - .owner = THIS_MODULE, - .driver_name = "EP7211 IR driver", - .type = IRDA_EP7211_DONGLE, - .open = ep7211_open, - .close = ep7211_close, - .reset = ep7211_reset, - .set_speed = ep7211_change_speed, -}; - -static int __init ep7211_sir_init(void) -{ - return irda_register_dongle(&ep7211); -} - -static void __exit ep7211_sir_cleanup(void) -{ - irda_unregister_dongle(&ep7211); -} - -static int ep7211_open(struct sir_dev *dev) +static int clps711x_dongle_open(struct sir_dev *dev) { unsigned int syscon; @@ -58,7 +24,7 @@ static int ep7211_open(struct sir_dev *dev) return 0; } -static int ep7211_close(struct sir_dev *dev) +static int clps711x_dongle_close(struct sir_dev *dev) { unsigned int syscon; @@ -70,20 +36,35 @@ static int ep7211_close(struct sir_dev *dev) return 0; } -static int ep7211_change_speed(struct sir_dev *dev, unsigned speed) +static struct dongle_driver clps711x_dongle = { + .owner = THIS_MODULE, + .driver_name = "EP7211 IR driver", + .type = IRDA_EP7211_DONGLE, + .open = clps711x_dongle_open, + .close = clps711x_dongle_close, +}; + +static int clps711x_sir_probe(struct platform_device *pdev) { - return 0; + return irda_register_dongle(&clps711x_dongle); } -static int ep7211_reset(struct sir_dev *dev) +static int clps711x_sir_remove(struct platform_device *pdev) { - return 0; + return irda_unregister_dongle(&clps711x_dongle); } +static struct platform_driver clps711x_sir_driver = { + .driver = { + .name = "sir-clps711x", + .owner = THIS_MODULE, + }, + .probe = clps711x_sir_probe, + .remove = clps711x_sir_remove, +}; +module_platform_driver(clps711x_sir_driver); + MODULE_AUTHOR("Samuel Ortiz "); MODULE_DESCRIPTION("EP7211 IR dongle driver"); MODULE_LICENSE("GPL"); MODULE_ALIAS("irda-dongle-13"); /* IRDA_EP7211_DONGLE */ - -module_init(ep7211_sir_init); -module_exit(ep7211_sir_cleanup);