From patchwork Mon Aug 21 20:22:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helge Deller X-Patchwork-Id: 9913671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 63932602A0 for ; Mon, 21 Aug 2017 20:23:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57D68287F4 for ; Mon, 21 Aug 2017 20:23:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CDB2287F0; Mon, 21 Aug 2017 20:23:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A81E527E63 for ; Mon, 21 Aug 2017 20:23:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754329AbdHUUXa (ORCPT ); Mon, 21 Aug 2017 16:23:30 -0400 Received: from mout.gmx.net ([212.227.17.21]:64866 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753781AbdHUUX3 (ORCPT ); Mon, 21 Aug 2017 16:23:29 -0400 Received: from p100.fritz.box ([193.159.21.213]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M81vR-1dNhZu1Jy5-00vdJe; Mon, 21 Aug 2017 22:23:03 +0200 From: Helge Deller To: linux-parisc@vger.kernel.org Cc: John David Anglin , James Bottomley Subject: [PATCH 03/14] parisc/sticore: Fix section mismatches Date: Mon, 21 Aug 2017 22:22:50 +0200 Message-Id: <1503346981-28024-4-git-send-email-deller@gmx.de> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1503346981-28024-1-git-send-email-deller@gmx.de> References: <1503346981-28024-1-git-send-email-deller@gmx.de> X-Provags-ID: V03:K0:iH2Mdwpme7hJ35i4EMSRWXY+xPG4BjY7rZRCeKfnHC4H655XlNn hWwuAuatLe346v5GMiFvMXGOph2p2wIurRsXbsGDyIvNxjgeQOAfR8k3MBN8pOuhrIS8gnn 9MgVExEO3OTFdWCqUWWdq6xOCBIozeZbwcdJStjdljqd5YH/A39t+yNkCbsmcdR6vXT7LJe d7NlPz7uFMWeKevc8vNkw== X-UI-Out-Filterresults: notjunk:1; V01:K0:AE7GDh/RN2M=:n8r6vAEPaZF6udVvrnelUK 3lloKV2/tLYi22vuNbEZzJsE0h02LKfkdrBo64uFfrQLX6fJje3xBH0KGLn+3fiQE7EavTKWm sQpUcpu7pWmAinVREnQeC1u4XlGE0rNMlpIbSjpblBeyhsN2Cr7tE8M01irYUXXBsRS5A+lQY rPCULUZlbp/TeodBCPotyUsisMmYXjN1eDAcHYPnqjSfhwa4s7aN0PWKggOAxBC6slEgmZ12H s8j8/laGB2G7oLpcYOJHp7bXjlZPIle/tiNmy9u9R+h4t9pIFum+vZzvXMVVrm1vJ+J1Igfhf lOeiWDC+Rs12Qc7tdKbhFrhTIrtmKnnPGepX3OG9an4Oa6XlWVO9Yj1BHkw5pvTyldgl/MG56 eoCMFLEhOYcg5aYkA4gYCYRM5W7A7LufNH254Q5Ro0w9i+SZLacYHEsjUR1NG9am2hNAsdXiJ /ekIWdivbkiy46f6Ih/fpzyi10VFcUyt9nDBApuJyoPx5e/aO+KsRxiXPlOo8WWjZ29sb6Ksu 55m8JnM6eCLg3XTvhiboMwcd0vCDrixtADuDebDs28ZmKszItmGAbUltHrqcGL7lXh2reZqfO NqTLV3VOZVA9VYGOCuu7SxDsEF0501QbmocSlv5D/3Jlm9ELQLbldiR6JMm6TA4H6UPYND2Ik xz26rn2KzH1v83UtOM/C4Pm3feU0+HtWc4new7J2WsEB+FGL9vwKzN8oOUfObZrSy1xt4wOas 9XULJmnJLd9zyYsRtYMNS8S5o4GDZRNIsCUVgSK+CC9TxNJQo+n3sLPvBWdxbO3Lae6Nlq9jQ 1YDWZukN5VMNaUWNGaCA9ptUyOxsQ== Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Helge Deller --- drivers/video/console/sticore.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c index 7da1ad0..d1d3796 100644 --- a/drivers/video/console/sticore.c +++ b/drivers/video/console/sticore.c @@ -281,7 +281,7 @@ static void sti_rom_copy(unsigned long base, unsigned long count, void *dest) static char default_sti_path[21] __read_mostly; #ifndef MODULE -static int sti_setup(char *str) +static int __init sti_setup(char *str) { if (str) strlcpy (default_sti_path, str, sizeof (default_sti_path)); @@ -941,7 +941,7 @@ static void sticore_check_for_default_sti(struct sti_struct *sti, char *path) * in the additional address field addr[1] while on * older Systems the PDC stores it in page0->proc_sti */ -static int sticore_pa_init(struct parisc_device *dev) +static int __init sticore_pa_init(struct parisc_device *dev) { char pa_path[21]; struct sti_struct *sti = NULL; @@ -1009,7 +1009,7 @@ static int sticore_pci_init(struct pci_dev *pd, const struct pci_device_id *ent) } -static void sticore_pci_remove(struct pci_dev *pd) +static void __exit sticore_pci_remove(struct pci_dev *pd) { BUG(); } @@ -1029,7 +1029,7 @@ static struct pci_driver pci_sti_driver = { .name = "sti", .id_table = sti_pci_tbl, .probe = sticore_pci_init, - .remove = sticore_pci_remove, + .remove = __exit_p(sticore_pci_remove), }; static struct parisc_device_id sti_pa_tbl[] = { @@ -1037,8 +1037,9 @@ static struct parisc_device_id sti_pa_tbl[] = { { HPHW_FIO, HVERSION_REV_ANY_ID, HVERSION_ANY_ID, 0x00085 }, { 0, } }; +MODULE_DEVICE_TABLE(parisc, sti_pa_tbl); -static struct parisc_driver pa_sti_driver = { +static struct parisc_driver pa_sti_driver __refdata = { .name = "sti", .id_table = sti_pa_tbl, .probe = sticore_pa_init,