From patchwork Fri Oct 19 10:24:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 192636 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id D23402C03D9 for ; Fri, 19 Oct 2012 21:25:44 +1100 (EST) Received: from mail-bk0-f51.google.com (mail-bk0-f51.google.com [209.85.214.51]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 9805A2C0092 for ; Fri, 19 Oct 2012 21:25:17 +1100 (EST) Received: by mail-bk0-f51.google.com with SMTP id e19so111780bku.38 for ; Fri, 19 Oct 2012 03:25:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=058tswH9F41jZyHAIPBDR4K/EKTSTcAS5OZZOFTzEHY=; b=gnfonvglLvWG+qhk7jRkvulOnuvRtlhJqj+Dd1ydplaiwEmFsUYmxrurl7ppgtBGmm YBXLpMp4Ke7QQhXY7J/5XMh5mnnqLJEZLE7k1DMZPteNA9uSTTqULN58BUudTr5jQvh7 naNzPCDPO7lng13g5Gu69PHIrpDQjvtpy5Wx49TwHVHWeWmk84w9vwuV3q/YDvo/0O9X FFpXTp0z381swIct3M5J8A5JMkx1tMZQmrzCSVTXFMDfY9u92vaGaaISnnkWDkjebo3W N0FKosALc4RshO9qwJCytb4Jqy5yyADdgAk11hFq7zswrR0Q0ovM40xtMfNYxkkALhRW 0qlQ== Received: by 10.204.156.18 with SMTP id u18mr223054bkw.131.1350642313993; Fri, 19 Oct 2012 03:25:13 -0700 (PDT) Received: from localhost.localdomain (p5DD1557F.dip.t-dialin.net. [93.209.85.127]) by mx.google.com with ESMTPS id v14sm598539bkv.10.2012.10.19.03.25.11 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 03:25:13 -0700 (PDT) From: Christoph Fritz To: Felipe Balbi Subject: [PATCH 1/7] usb: gadget: fsl_udc: simplify driver init Date: Fri, 19 Oct 2012 12:24:39 +0200 Message-Id: <1350642285-8145-1-git-send-email-chf.fritz@googlemail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1350642156-8034-1-git-send-email-chf.fritz@googlemail.com> References: <1350642156-8034-1-git-send-email-chf.fritz@googlemail.com> Cc: Estevam Fabio-R49496 , Li Yang-R58472 , Greg Kroah-Hartman , Chen Peter-B29397 , Sascha Hauer , linux-usb@vger.kernel.org, "Hans J. Koch" , Daniel Mack , Christian Hemp , linuxppc-dev@lists.ozlabs.org, Teresa Gamez , Sebastian Andrzej Siewior X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" To initialize this driver use 'module_platform_driver' instead of '__init' and '__exit'. Signed-off-by: Christoph Fritz --- drivers/usb/gadget/fsl_udc_core.c | 37 +++++++++++-------------------------- 1 files changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index 6ae70cb..340451d 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -49,13 +49,14 @@ #include "fsl_usb2_udc.h" +#define DRIVER_NAME "fsl-usb2-udc" #define DRIVER_DESC "Freescale High-Speed USB SOC Device Controller driver" #define DRIVER_AUTHOR "Li Yang/Jiang Bo" #define DRIVER_VERSION "Apr 20, 2007" #define DMA_ADDR_INVALID (~(dma_addr_t)0) -static const char driver_name[] = "fsl-usb2-udc"; +static const char driver_name[] = DRIVER_NAME; static const char driver_desc[] = DRIVER_DESC; static struct usb_dr_device *dr_regs; @@ -2761,35 +2762,19 @@ static int fsl_udc_otg_resume(struct device *dev) Register entry point for the peripheral controller driver --------------------------------------------------------------------------*/ -static struct platform_driver udc_driver = { - .remove = __exit_p(fsl_udc_remove), - /* these suspend and resume are not usb suspend and resume */ - .suspend = fsl_udc_suspend, - .resume = fsl_udc_resume, - .driver = { - .name = (char *)driver_name, - .owner = THIS_MODULE, - /* udc suspend/resume called from OTG driver */ +static struct platform_driver fsl_udc_driver = { + .probe = fsl_udc_probe, + .remove = __devexit_p(fsl_udc_remove), + .suspend = fsl_udc_suspend, + .resume = fsl_udc_resume, + .driver = { + .name = DRIVER_NAME, + .owner = THIS_MODULE, .suspend = fsl_udc_otg_suspend, .resume = fsl_udc_otg_resume, }, }; - -static int __init udc_init(void) -{ - printk(KERN_INFO "%s (%s)\n", driver_desc, DRIVER_VERSION); - return platform_driver_probe(&udc_driver, fsl_udc_probe); -} - -module_init(udc_init); - -static void __exit udc_exit(void) -{ - platform_driver_unregister(&udc_driver); - printk(KERN_WARNING "%s unregistered\n", driver_desc); -} - -module_exit(udc_exit); +module_platform_driver(fsl_udc_driver); MODULE_DESCRIPTION(DRIVER_DESC); MODULE_AUTHOR(DRIVER_AUTHOR);