From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935546AbcKOOAV (ORCPT ); Tue, 15 Nov 2016 09:00:21 -0500 Received: from mail-dm3nam03on0068.outbound.protection.outlook.com ([104.47.41.68]:14256 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752558AbcKOOAT (ORCPT ); Tue, 15 Nov 2016 09:00:19 -0500 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; imgtec.com; dkim=none (message not signed) header.d=none;imgtec.com; dmarc=bestguesspass action=none header.from=xilinx.com; X-IncomingTopHeaderMarker: OriginalChecksum:;UpperCasedChecksum:;SizeAsReceived:1792;Count:20 Subject: Re: [Patch v7 4/7] irqchip: xilinx: Rename get_irq to xintc_get_irq To: Zubair Lutfullah Kakakhel , , , , References: <20161114121351.10924-1-Zubair.Kakakhel@imgtec.com> <20161114121351.10924-5-Zubair.Kakakhel@imgtec.com> CC: , , , From: Michal Simek Message-ID: Date: Tue, 15 Nov 2016 13:24:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <20161114121351.10924-5-Zubair.Kakakhel@imgtec.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.0.0.1202-22700.004 X-TM-AS-User-Approved-Sender: Yes;Yes X-IncomingHeaderCount: 20 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(438002)(199003)(24454002)(189002)(4326007)(81166006)(7846002)(2906002)(92566002)(64126003)(81156014)(6666003)(31696002)(77096005)(2201001)(8936002)(189998001)(2950100002)(9786002)(36756003)(23746002)(87936001)(33646002)(47776003)(65826007)(63266004)(36386004)(229853002)(31686004)(86362001)(5660300001)(356003)(76176999)(106466001)(8676002)(83506001)(65806001)(65956001)(305945005)(54356999)(50986999)(5001770100001)(626004)(230700001)(4001350100001)(50466002)(107986001);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR02MB003;H:xsj-pvapsmtpgw01;FPR:;SPF:Pass;PTR:unknown-60-83.xilinx.com;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BL2NAM02FT023;1:HBiHXJjyIAQp3PoPoB3aO5MTwtrXX6tgABhWeNG8vcrJMqoMTiEXnckYVo97XODyTYVjPusWBA7XbBHYNkaA1VH8rPSxjoTPyqde4JnpnzNOXQ1xh3DHE4zSToRfA3zmjk6rtpzOxuj/wpIqKOxZqoL9TWQESmxkZGtoS1YF4/SGLzjxwmRIMaglHTPfeYSr2zsLTW1X8G2hfvmMWkwCNSPY94YO7N4X97jUMrO9Y1EKLFKlu2ns8N1pg1AIvL/ngenKhsMPsxgR6fqMNDKnoXX9KKy2SUjDpSeowxq8U+GMtNli8a0a9WLoT/uafjHVwJ1c6+ckCqKSBY+/EQf/lAg39in45SnKKViMpm/ZQLx6+BgKmWjtnJ/0RT/uzh+NtZbAWiwnTG/QbTWPWYExYCVSz+lNbTJmcr+nY5V8T+Vk5Ori1HVRB1fANUtIqcfJDovfe03uWcQdRRqi8YCP5bILrefwuC8j+B23D+/Fi1mSZ1aG5oiUSzNpY048oUZrUFngRtFCHjWWYFi9ph3T9x+QU3ElzZjtM5hfFSSsF9IWVPuUakBJ3TT4YExZULUT/8q8x5DqPqQnivGMetQb4tT32hj8nS35Jbc9KGNsOWQ= X-Microsoft-Exchange-Diagnostics: 1;BLUPR02MB003;2:rviklcDzD+vJ+qsh5ScYQVRh1fFsjRRcfluRXF/VE6OQoMobUasiIXvDwvWAljqT4ehUmg6VKABH+VVDrRoA+4HZNys0rr4HFCrLtPgRAt4O/cQzW2Vh7m+8rVySFKgOHTPeVen3lF/BFSzH2r9ivWHfsCchi53FOArfWnQIk+I=;3:t3FIX68ELkHj6bYV5lWm/hsHvwRytMd6gYurkUEEBANyY9lmIamQzsSymcD5cobGT8tl1XoPEOZQ0VUZZR4LsVbIyizIiWhw7x8KPiroaXZPYHYjWG6N9IIa0ovlFqi+nu/ZKJv0TUMn8pjGqG4curXK/NauZfXRKzJZlzqR8ifdj0iQ4NdqKiwWw1ud6zBN/dprTieV0uwUbRksrGcN2XAXOJU0LQWpdOZJq4eaE3XHgJ4d788xHRpXpiZJUYDLVhZi5RsDi5uvGtqLt+6APSmq6p6aKAUJ/8zOiVmopEo= X-MS-Office365-Filtering-Correlation-Id: a8946179-a4e8-4483-9a23-08d40d526eca X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(8251501002);SRVR:BLUPR02MB003; X-Microsoft-Exchange-Diagnostics: 1;BLUPR02MB003;25:6mli9TDwiEsx1IrohJkpECqZLpxL1IvCGjrv/OY3JIff4Li1bbFMnZ7c5sSpDmaMvGlR6agqB62WGAZssXAfT8PzazW47Gpt8WxMi6KeJI4fMsWyJ7Yuy/q3xD5ZZYl2de0aD/p9Z9dABjlzJJh1Ab4j2TcYbG5YRCC7PG4GF+fFsClt2U05zHSH8Kd9Sh9t/6U99Yx2R1+EWlzUGBXM8zZlXpcr5yFborAzayq3mCauEnVWFHLGqmQAMk7rnl5+ilYyTRXBauSHi5iK+cIuRkweatXEPxiwb1173wtphrdu1kVLbQ3yHWthxW/Li9Lm/fqCEk2Z1xb3y56UWCY/+he/JGk6W1tg5gWbWyVyNEl0y9V/qxPnmtbi8HuDrICnzIQg5WNnDXfRSw9vntBD8JisfMjkkOib4Z04dWOYBy4BMWX3LDSWnmREWqHyVHSzpiX6K9ITRyWQJd2V9P6pzQ==;31:SYUAtHej24C5PI0pIilmdXBODKe+2ODWufkF9/a3WC1qUgldNwzfnNMhlXqilcYNXr4W8d6EeL+wTdrKT/mMyFoTzDoNKaf69RO7PYfw3x4JcBVgtbN66E2IhuT4XTgo7Bx9xjiZVFP6q3bBI2NzHndG/RrJs14hPJyIgqaIgCQ7ZWWY07IqpZfnIwVjb+vFv/b/B3lJ6fBEVoikTyyXqZWO5iPsBP7NRam//2jB7nN1+juC8aXdieikIJIuDiX9s/ktorUSmP92hr28sIyAheedoSPaAjPCTnjvvodnSKk= X-LD-Processed: 657af505-d5df-48d0-8300-c31994686c5c,ExtAddr X-Microsoft-Exchange-Diagnostics: 1;BLUPR02MB003;20:wN2V2whrJoPn30lcszqBSBZHsoTSWdOzE3ZSrfcbPJhKCUkPsUNHooqWxCan+RH+nItg6qSqU4hMSCEG5pdTdHu6uIihqarH2pY0C1S63YsRH5l9oCI8kR/3vGVY9yAvJiRlQqanzPrm6QJUVTKvOhyXcU8fVgDfdPq6E6pOqBaU1nnfWKYlSGrSgeJjQs1lX70KQM1JANxwKB0u+EM3ipjb9aQwBrDz6ga4iL47RsPcsLmlSi5vuKwEgfRvkWkv0++5Npq0SvRxAQ6njz60CFRW4e7Xn0Z2gaZrWs1fLoRQe73IQ2tVuVWWX/3roVaJuoihyFn8CWXxduju+3PnZo3tVbyn79wajbHF0JfimmW7cpaOwqPRmrIA/Gt0YoXoKUy5DeRt/6zlwq9H/REqsHSVzfCdNd6Xf+gd8K3lHq6Elafj4tgQ9QoJMLKLDEhKIlM5Bf9nsd79NATNPAqbInUhA/I9Whqd+soheNj1xtlK2Z14JynBKlIzCsJYIbip X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6060326)(601004)(2401047)(5005006)(13015025)(13018025)(13024025)(8121501046)(13023025)(13017025)(10201501046)(3002001)(6055026)(6061324);SRVR:BLUPR02MB003;BCL:0;PCL:0;RULEID:;SRVR:BLUPR02MB003; X-Microsoft-Exchange-Diagnostics: 1;BLUPR02MB003;4:MzsVqCjtD/mqqYVFVh73yS6bIu16TaTp0K9c/odzFwN5eqOzPe4fNbNIpIHj6FosnBsTaMmYlzuwD9eTuKTOiW2U+T016tXsln3hqo3xktTmqH5JDGN3TxYK/aZ38yb04XY6txL6CQkCvCj2NzRiMWtaJ3cwV8j1trbtBzDfrk5N/gp/3gZ43VEAasFLzL3k/wG2vfNPvFCPK3nwbp2sO7hekYbJqJz9ywmn1eLIp/xEl6hjZmuYGSyYJ8BtOlhgzFfJyLzJYjc1Ge+UuiQilJdf5vg6fFW4ggPKtUwZNHgM7Ii0oyybquJRq3hSp0a7gZgclv0psH6fRkYlcFn/swYBtM4uz7kX9nyTNmuRITpeytuoS0WWubL9sRGzeUsqbg50+eJXM/NFCOehWRlFMLbj2bnyMZqWt1FTQRJCqunM6sAmCcoBMG0LTrzfsPjX+bXyiIPg+OhfDgWMXQ5Q5UOfT7dvtbGjCqlmR8CLU78eXaZARr6UFdAzKr4qpQtcPDaGblAl8/mPxsZPkLI4K0S2Vu7Ks1ktVdKL+TJzX+yBhCLrZuWX9wnsOzLIDRwZOcTV7DGplfvQqOCJFKy8iA== X-Forefront-PRVS: 012792EC17 X-Microsoft-Exchange-Diagnostics: =?Windows-1252?Q?1;BLUPR02MB003;23:/1CaXDywifkhFYJFEGNgVWntBEZbYRsmXWaOMZ?= =?Windows-1252?Q?+qRA8lyj6eqi2xQflKJD8dWm5cWct9Ibf0y0sQX1Z8GOceY8ni5fd4Oa?= =?Windows-1252?Q?okm2i3J9oAo4HK57gokdZ/iH1xNfuaDww1138KFWG7G0BazeZAGj3LQf?= =?Windows-1252?Q?sPcjBZ6I6+MsVjnx7tj+CF1mkI+hGEYvaArcHbR4Vbt5I38jnLU//jOj?= =?Windows-1252?Q?MnPz5cvNJV6Gfl4Ul1MEicGDDYhEas3HP73aRO/KpootLi3OdhG3AZwK?= =?Windows-1252?Q?vtaw77e5634SaS31O0f/zven4/IRk3WMqQH1AlrK9LggZPCJZqJiGJ0q?= =?Windows-1252?Q?OKSEDT+ztNX2w9RsRz29WQXdAPTDiUdYBKsX7kyF85uJqDbfg2Wu70rI?= =?Windows-1252?Q?CYUo2aVKP7WMITzFbRVWdlvx1GqP277ph+0jA/FOiksKAJCbuyK7HVZ1?= =?Windows-1252?Q?5YA0FVxD2aZQbOlIdcKgb96jgusC4Gey+hSf/Wzj4ejO9Bjve8y5ObA1?= =?Windows-1252?Q?uTiFtxwo64AfFPMGRbba6cdUws3SwqEv8EWdl2Op4e+c0Ou1JOsOL/oF?= =?Windows-1252?Q?ihOaor8l092CWzyakkvtMo9uczN05a6oyhB08/IbJSvEpN3NEQNXCHbO?= =?Windows-1252?Q?+Pg/tBVJiSKzt9qWACSwqpr6YNpErUj3vg5W+YsAodg17L4xIk36XM08?= =?Windows-1252?Q?QxghoA42a+y+WWATzClVRAfF0NA8ue5WVLla2ORGZ/fEnGpxHIUrZgyv?= =?Windows-1252?Q?1oU97jt6Il0sVavaTFIa3115a8Ug+aeqEwkj0yOd89Hdq3y2f0apcfL8?= =?Windows-1252?Q?XDk9UFPRWHr93mw9qrZTqijoHPWnvH5leMQzOsEAEuD3ctW0CzxSXJbb?= =?Windows-1252?Q?C/jWnIYs9etTtZO8zDvHcyUKNUK3fL5ZMNZfC06AMl6NLBMf2VV0prv/?= =?Windows-1252?Q?IiZN0ZtzirZgce2xsQCTOCNWS4S+knPYRZZAyGXs40WFlkDEwDgkraho?= =?Windows-1252?Q?FJ3SCgRtjbyXV2+Lfk/ylCpiwOJ8IpvEIuETpcaNFGYvACh3dyoKCXWN?= =?Windows-1252?Q?LstG70tBVId9UVyDVFy6KcLYlTYaX0afzdmDDvby234fQGlcf+NZP2V2?= =?Windows-1252?Q?JVCt1usqe11Cd19YDIxQxQSCFmpAXCd4xJsgcMyQmfPUBhrCKaVW2fS0?= =?Windows-1252?Q?NlZuGMM783kwPeOS7ykwKxWI/P8GANb8Papkwo4PRSZaVqF1GNbskGuT?= =?Windows-1252?Q?qAQi+ubNntBFhlEgHpEKEPGb9T4PQwMZ7Ospw=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR02MB003;6:wi7hNiEg6w3OlGmjULMWeDAGEbFfVgZAAbkeFxU//c+JY4B98nhPbjJuPTG5aZnvE6KpEX9JznpdE7wfJDE5oLR/Nc+QPsMhbbl5InnSHvMz/IQNcj5YmXyGUpV6hXDVQL4os4NcEbhSYxfKCQav4Z5NjBI/cbJ1LyH1C20bDnwg5bNHjlKSgd7zj1foHS1zDHLGJdRKk2aSQFOMhG8bVsYf9Rek0UydFfn7yj2qXXCb7Qb6QzuwFo9TwOJ7S7cFz7GI+Kl8/brecYtm/KmvV8i0gcxyhxLfxTe5lzbF0Nx/OnVGw5NT5qRjGfcttIaDg8GllM/bI+PZ+XmaAcDWr2dHV3qHQiM3EpsRwCA3ULipdQDNSg4zYVZmTZIQraoD;5:jP8I8KjIselQW43qmqo+1I9nc5u6jOGzdC7EzW+frCB9OmAmq3hY9sIBBOfRL1gZAllX5Oz56HYR/vEni8nOpNwktneh+k5jN7EdUV1UjVnRf1Thb6ZPAiEZvj0Q0kt8dekLW2BIX2tQ/wqjlZORFg==;24:vY0FmVm/mkn4po7xl0DhsPWA0ZZeh6xrZ4siU+CC20DRY9ExJoE8YyAks2UatldDVesO64zbhhwhIRPzld/U1xldn7BV4+r2ilzJreQjk6o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BLUPR02MB003;7:GCI+JZzyNMO03qzx/CjAN5zSXzTxFH+xk7OitiLD6DWH5co0QcTVuU+oA6MR8gx77Eruqx+j9R3hLyTyKxdfmQDiaOc1D9jUQjgsWT9tnaRo+fozjSlMYtHk/nzfL+Nkj9t+kSgzbnw5UztMqC6qfY1jeyvD58H/Z7jArwMn9Lqsx8aHTGjhJLroQI9wADyG9k5tHbKO2bgndZVZltY6EkUtaLdxNQ+NdwHKME+bT20t5ehAHPfFEb4tZXKes2dYYC6b+5wnB2KmLmguDYhKdikWbLSvPY17TNaqvyddN1iQYEkReMjGVpFM7mP1ACX0sOVV4swk7r8DaUh5ERZ7T3mWrybmHZYXmLepSdDHYHQ= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2016 12:25:06.1458 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.60.83];Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR02MB003 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14.11.2016 13:13, Zubair Lutfullah Kakakhel wrote: > Now that the driver is generic and used by multiple archs, > get_irq is too generic. > > Rename get_irq to xintc_get_irq to avoid any conflicts > > Signed-off-by: Zubair Lutfullah Kakakhel > > --- > V6 -> V7 > Rebase to v4.9-rc5 > > V5 -> V6 > Removed __func__ in printk > Rebase to v4.9-rc3 > > V4 -> V5 > Rebased to v4.9-rc1 > Use __func__ in pr_err > > V3 -> V4 > New patch. > --- > arch/microblaze/include/asm/irq.h | 2 +- > arch/microblaze/kernel/irq.c | 4 ++-- > drivers/irqchip/irq-xilinx-intc.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/microblaze/include/asm/irq.h b/arch/microblaze/include/asm/irq.h > index bab3b13..d785def 100644 > --- a/arch/microblaze/include/asm/irq.h > +++ b/arch/microblaze/include/asm/irq.h > @@ -16,6 +16,6 @@ struct pt_regs; > extern void do_IRQ(struct pt_regs *regs); > > /* should be defined in each interrupt controller driver */ > -extern unsigned int get_irq(void); > +extern unsigned int xintc_get_irq(void); > > #endif /* _ASM_MICROBLAZE_IRQ_H */ > diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c > index 11e24de..903dad8 100644 > --- a/arch/microblaze/kernel/irq.c > +++ b/arch/microblaze/kernel/irq.c > @@ -29,12 +29,12 @@ void __irq_entry do_IRQ(struct pt_regs *regs) > trace_hardirqs_off(); > > irq_enter(); > - irq = get_irq(); > + irq = xintc_get_irq(); > next_irq: > BUG_ON(!irq); > generic_handle_irq(irq); > > - irq = get_irq(); > + irq = xintc_get_irq(); > if (irq != -1U) { > pr_debug("next irq: %d\n", irq); > ++concurrent_irq; > diff --git a/drivers/irqchip/irq-xilinx-intc.c b/drivers/irqchip/irq-xilinx-intc.c > index 7331d8c..34ec609 100644 > --- a/drivers/irqchip/irq-xilinx-intc.c > +++ b/drivers/irqchip/irq-xilinx-intc.c > @@ -101,7 +101,7 @@ static struct irq_chip intc_dev = { > .irq_mask_ack = intc_mask_ack, > }; > > -unsigned int get_irq(void) > +unsigned int xintc_get_irq(void) > { > unsigned int hwirq, irq = -1; > > Acked-by: Michal Simek Thanks, Michal