{"id":955,"url":"http://patchwork.ozlabs.org/api/1.0/patches/955/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<200809222151.m8MLp3PH031901@imap1.linux-foundation.org>","date":"2008-09-22T21:51:02","name":"[3/4] mISDN: annotate iomem pointer and add statics","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"2932778596265344f2de2b34a377a55756b76a0e","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/200809222151.m8MLp3PH031901@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/955/checks/","tags":{},"headers":{"Return-Path":"<netdev-owner@vger.kernel.org>","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Received":["from vger.kernel.org (vger.kernel.org [209.132.176.167])\n\tby ozlabs.org (Postfix) with ESMTP id E2880DDF01\n\tfor <patchwork-incoming@ozlabs.org>;\n\tTue, 23 Sep 2008 07:51:49 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1753490AbYIVVvj (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tMon, 22 Sep 2008 17:51:39 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1753480AbYIVVvj\n\t(ORCPT <rfc822; netdev-outgoing>); Mon, 22 Sep 2008 17:51:39 -0400","from smtp1.linux-foundation.org ([140.211.169.13]:37338 \"EHLO\n\tsmtp1.linux-foundation.org\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1753379AbYIVVvi (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Mon, 22 Sep 2008 17:51:38 -0400","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLp3eO018199\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:51:04 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLp3PH031901; Mon, 22 Sep 2008 14:51:03 -0700"],"Message-Id":"<200809222151.m8MLp3PH031901@imap1.linux-foundation.org>","Subject":"[patch 3/4] mISDN: annotate iomem pointer and add statics","To":"kkeil@suse.de","Cc":"netdev@vger.kernel.org, akpm@linux-foundation.org,\n\tharvey.harrison@gmail.com","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:51:02 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"<netdev.vger.kernel.org>","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: Harvey Harrison <harvey.harrison@gmail.com>\n\nSigned-off-by: Harvey Harrison <harvey.harrison@gmail.com>\nCc: Karsten Keil <kkeil@suse.de>\nSigned-off-by: Andrew Morton <akpm@linux-foundation.org>\n---\n\n drivers/isdn/hardware/mISDN/hfcpci.c |   14 +++++++-------\n 1 file changed, 7 insertions(+), 7 deletions(-)","diff":"diff -puN drivers/isdn/hardware/mISDN/hfcpci.c~misdn-annotate-iomem-pointer-and-add-statics drivers/isdn/hardware/mISDN/hfcpci.c\n--- a/drivers/isdn/hardware/mISDN/hfcpci.c~misdn-annotate-iomem-pointer-and-add-statics\n+++ a/drivers/isdn/hardware/mISDN/hfcpci.c\n@@ -43,7 +43,7 @@ MODULE_LICENSE(\"GPL\");\n module_param(debug, uint, 0);\n \n static LIST_HEAD(HFClist);\n-DEFINE_RWLOCK(HFClock);\n+static DEFINE_RWLOCK(HFClock);\n \n enum {\n \tHFC_CCD_2BD0,\n@@ -88,7 +88,7 @@ struct hfcPCI_hw {\n \tunsigned char\t\tbswapped;\n \tunsigned char\t\tprotocol;\n \tint\t\t\tnt_timer;\n-\tunsigned char\t\t*pci_io; /* start of PCI IO memory */\n+\tunsigned char __iomem \t*pci_io; /* start of PCI IO memory */\n \tdma_addr_t\t\tdmahandle;\n \tvoid\t\t\t*fifos; /* FIFO memory */\n \tint\t\t\tlast_bfifo_cnt[2];\n@@ -153,7 +153,7 @@ release_io_hfcpci(struct hfc_pci *hc)\n \tpci_write_config_word(hc->pdev, PCI_COMMAND, 0);\n \tdel_timer(&hc->hw.timer);\n \tpci_free_consistent(hc->pdev, 0x8000, hc->hw.fifos, hc->hw.dmahandle);\n-\tiounmap((void *)hc->hw.pci_io);\n+\tiounmap(hc->hw.pci_io);\n }\n \n /*\n@@ -522,7 +522,7 @@ receive_dmsg(struct hfc_pci *hc)\n /*\n  * check for transparent receive data and read max one threshold size if avail\n  */\n-int\n+static int\n hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)\n {\n \t __le16 *z1r, *z2r;\n@@ -575,7 +575,7 @@ hfcpci_empty_fifo_trans(struct bchannel \n /*\n  * B-channel main receive routine\n  */\n-void\n+static void\n main_rec_hfcpci(struct bchannel *bch)\n {\n \tstruct hfc_pci\t*hc = bch->hw;\n@@ -1678,7 +1678,7 @@ hfcpci_l2l1B(struct mISDNchannel *ch, st\n  * called for card init message\n  */\n \n-void\n+static void\n inithfcpci(struct hfc_pci *hc)\n {\n \tprintk(KERN_DEBUG \"inithfcpci: entered\\n\");\n@@ -1965,7 +1965,7 @@ setup_hw(struct hfc_pci *hc)\n \t\tprintk(KERN_WARNING \"HFC-PCI: No IRQ for PCI card found\\n\");\n \t\treturn 1;\n \t}\n-\thc->hw.pci_io = (char *)(ulong)hc->pdev->resource[1].start;\n+\thc->hw.pci_io = (char __iomem *)(unsigned long)hc->pdev->resource[1].start;\n \n \tif (!hc->hw.pci_io) {\n \t\tprintk(KERN_WARNING \"HFC-PCI: No IO-Mem for PCI card found\\n\");\n","prefixes":["3/4"]}