From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757350AbbJ2Tqz (ORCPT ); Thu, 29 Oct 2015 15:46:55 -0400 Received: from mail-bl2on0068.outbound.protection.outlook.com ([65.55.169.68]:53088 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757056AbbJ2Tqx (ORCPT ); Thu, 29 Oct 2015 15:46:53 -0400 Authentication-Results: spf=fail (sender IP is 66.35.236.236) smtp.mailfrom=opensource.altera.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=opensource.altera.com; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=atull@opensource.altera.com; From: To: CC: Josh Cartwright , Moritz Fischer , , , , Alan Tull Subject: [PATCH] fpga manager: remove label Date: Thu, 29 Oct 2015 14:39:56 -0500 Message-ID: <1446147596-13185-1-git-send-email-atull@opensource.altera.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [64.129.157.38] X-ClientProxiedBy: SN1PR0501CA0017.namprd05.prod.outlook.com (25.163.126.155) To BY1PR03MB1514.namprd03.prod.outlook.com (25.162.210.148) X-Microsoft-Exchange-Diagnostics-untrusted: 1;BY1PR03MB1514;2:m4ZAbpMlGc5cBypIQRRpegRDW4Bs9Q16rLEnljKgwXywbziIdx4NxBL65j3YI7VPo5yCEUAIV2EJqU3Qf5Hj66JvvvZta1+xACpD7FZze1SlzndzvNsxZBmq8p6fsIBHx91/KRw5ThbfCTBY4QmsmrfQEnCRRM5C14IHIeddIn8=;3:f/d+vvDyt2vmzWW/rgkenp8dCWLU/BILi1+QHohLq3bt+MdGrneiL5eeZ0Yo40p+XkQiUfymhjFV/YTFAEEDE5STKzHer+eeSlGOhJk5ipWEJ/i8t5n1Wkvm+1/5ksgE+hAXSiFAQfUg+/D8RYS9zQ==;25:xFsGRRlaLJzzhkte8fd/9aJbeMNl0rv35HUxXPAp7wGC3iWcdEOW3yvjvArfKueBvXHEwz1LtRiz2xj+Yun2H5CDQZJsnJuCipgvwwOsuuMS7xKgFYapuLpznw9MICA0MHEZd1BsPMhX5KyJbhCQkVVuqKgV2CLKkAwwxWA2qyGJhwOVDcqUzpcy5VV/g1FIWUvPF0zrAQHbB94K0ImKATfLbXAQX3Fj/Q44fusmMh5VSr1DjTtrGv8XuLJm6JED++vIr3GSu8+xK9U3vXeORw==;20:PRKHJsotYHOQFC/4N0YrCao8PmG56L1CqKMONfV5clTf7oaefV4X29dxS+/uCHvk1o4nZr+Not1mkuluMSYpN/dIQ8RfUrYsvbbEiH7ISHNTzE6v0HgLp7t2g7ni+x2REkv8gsCS3SgLvcBz3K6wCyFcz1LuHpjZIfZnep8yrjQ= X-Microsoft-Antispam-Untrusted: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1514; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(80048183373757)(204874498639787);UriScan:(80048183373757)(204874498639787); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(5005006)(8121501046)(10201501046)(3002001)(102215026);SRVR:BY1PR03MB1514;BCL:0;PCL:0;RULEID:;SRVR:BY1PR03MB1514;BCL:0;PCL:0;RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(10201501046)(3002001)(102215026);SRVR:BLUPR03MB1489;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1489; X-Microsoft-Exchange-Diagnostics-untrusted: 1;BY1PR03MB1514;4:qgbLgWUkl6jTv8Enp2iU+Lc4C5oXvHwn1i7lnpfbDDC7CHoFDJFzHcQkgLftpGdO+c1PCwBKjkdBj0HgvCGzKl9UkNH+9EC5BbwS7JG4GJNvn/qsTZJnoW35rNugxJrY1Nsw/VCKcrQOofABiq5MgFWcKl+f8wmSlhqoYcIQlVL5IyrMdQYHksCHBprhaW3W3jX2YpDqUUIBfoEO8VgBQKiHKm9t3MUftDdzPdKNo/uMwXejIgpONHf09XjKspn0CH3HbH4OR38sFb7q8e0NUNvc5NRjMOftGYay0YwYj7oYTOfINXVEfrqG+b+0OHgbdqN5TscgT8LGR5wNYoeC92cY4NuckjbSpqbSnp8NzeKhme929QbVu/c3SBGfqDoorMx9W5INgcGa+d8JOMH02Q== X-Forefront-PRVS: 0744CFB5E8 X-Forefront-Antispam-Report-Untrusted: SFV:NSPM;SFS:(10009020)(6009001)(199003)(189002)(101416001)(50986999)(110136002)(92566002)(189998001)(19580405001)(86152002)(19580395003)(5004730100002)(107886002)(229853001)(5001960100002)(50226001)(40100003)(122386002)(77096005)(86362001)(33646002)(2351001)(105586002)(87976001)(5001920100001)(48376002)(5007970100001)(106356001)(5003940100001)(69596002)(42186005)(50466002)(53416004)(81156007)(5008740100001)(97736004)(66066001)(4001430100002)(47776003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY1PR03MB1514;H:linuxheads99.altera.com;FPR:;SPF:None;PTR:InfoNoRecords;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics-untrusted: =?us-ascii?Q?1;BY1PR03MB1514;23:84Jlv2R/6bIeMfa6X3I0Vuj/QE2xKVPTpJ4X/+2dF?= =?us-ascii?Q?dPo/5WGmeN6Oo7XxnK9E4Zlay0p75nNNywM+UAEFOjenihjfQs391sQC7EFo?= =?us-ascii?Q?dsLJfR7SP/Z9NG6leDI/EJK9curwRi3lYSWX0D1/e/RgUQnwE9hB5XLnqY5t?= =?us-ascii?Q?qKaRqfCUOzoZYRIDZSoYFbgpo1/x3xWyyYUTZivOIPKLs/ei1AVkg7RuYduE?= =?us-ascii?Q?mx5Bi0I853mMsFySXRKt0ilMg461OLwMYRYrn2NmnsUpdq7BH6sIYPau8IYD?= =?us-ascii?Q?594rxOj2vC+npN/6ZNW0aiple13hCEp9ytHSNaZSazQqm9I6zD4159yvtbO2?= =?us-ascii?Q?OALHfuEtR6GCpk/N81M2g8a+/T62AKGNoWHKbmKCOpGu6WxI9yeZvyjYU8n4?= =?us-ascii?Q?XInkbEfcr3gOSsxwR2eoQ9cgHExyWEHOquGYO2wKfk+uZUsudETBwPxr4mKf?= =?us-ascii?Q?G9xkaznpD8K1gC1unM+yseYQujjoQ0uXjFTE1U+h/pth0ba4TMvIMN6nF2dv?= =?us-ascii?Q?GBL3lULQ58Sav0J93sQICN78NxlUjQvXhYx3TxNr3z3MrZ4h8EjckRVpJXjC?= =?us-ascii?Q?OD9bHjOGU8V04szFuIXH6fEHdiFXdcl+bCk9ZlempL9DbYrzC5RwJ/B3IbQy?= =?us-ascii?Q?9ONWXCrEas9OZKi402w8aEnT/dVI2Lp25H7sYvVuHNWvJsk6pee8Qw36ew7b?= =?us-ascii?Q?p7uh0ScIJrMHR3E4QN+v8A+PaSwgRF8GdcbAJLwAZdtDQkzrLDq9IsC938Hi?= =?us-ascii?Q?FciNfgz6djqDOh+dImSBYlt+T8Gseq+61RdLe+vsPlrx2LcxzaVTB6uamq9l?= =?us-ascii?Q?TeLfoG2kUaCcn9tnShgZFMPDPE1r2ENk8nM0RqSPz0rbw7KPaiP1gpCTvZVH?= =?us-ascii?Q?g2kqDsdF5T6KMr4l6hJzRs28KMjXsICQ4d3oHSS0tbIY5JNUkkJ5prJEP+no?= =?us-ascii?Q?kTISEDlvHrnS/EoUfuac2PkLmwDOvbTYK8i0OF+AqOHA5PqDMKJAxQZFTLz6?= =?us-ascii?Q?NcLfJEP2V+IpTgLkDVnYD4F4uRYviED7L3DmScNT0PyVO/IZNtGTTF8YVhyj?= =?us-ascii?Q?WYlXyy8lSqVoq8QgqmuVxlf0mUm?= X-Microsoft-Exchange-Diagnostics-untrusted: 1;BY1PR03MB1514;5:+TqWQmUZHns2mqBIGRMPqzKB4cKlQwHsbeNMoM/P78wBAh+TZDqS3lLjKnrvx/eQdEKUK8GTFL0KUjtrlVIHupI1EJnN4ta9uEnr2cxCGHNKAAYPihL7vOVnDzcT9Y7hMJGLrww6hMzxjxj4fB1gRA==;24:U1QTw5oTUn0Vzh0ZbM4jAdpCYRrhMjexHZlhkt6kkpLMF2c33/ksosmZX3sEBw7EyiRuWduQIxw0i+OYJHwGqxxbBN2DiQBU9l4FTVFi7O4=;20:vIpVEakJz1IPSXZWPTPtmLJAkCIzA7mr5Vres3R9NI51T/jF8C1iZyN+8TuTHwI0vhjJ1kbkteO5BzRTcZW7P/vcTiv4uuIigEN10AKNDJVwqp0oGn46baYl4N/EXO9mOs47gk2EzqQnYRnmIlRQ1jobmMefvWMEsJvv8gCthSA= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR03MB1514 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: BN1AFFO11FD037.protection.gbl X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD037;1:Dn64zeoR/KlIfUKHXbx6ij6zI51HlcZfHY6y/o7s9SmwVo2RKOAR7ac3Gu9cX1JKvZ/DZoV6UZ26nogbOXxHnwEwAaLWiJw+y21YTE15S08PxuVhjZTARaRNxoa9lN5E4pyjTYT83HZyxV5eVxPfxOa49YUJtZ69OvzQD6LPp0fKU7AFAAww/lEujR6qgmCH6dyqmzcbDMD07LxF9D48xh9ihXv2MVDdtjF06fXzL95uxbKqvkbwVQRUrAvzf6nhLpZkgjHUABkD229o2lgfVsKtMzSlY3cpgjhYdh6qBEVofDXimmpv2Twm2GXyXjgSy4uPdN1p/ev1hcm9IySoIDcnJJc+gcwHz/ywhX31ikFQ+7qChWAX6bdQ/pdSw2my X-Forefront-Antispam-Report: CIP:66.35.236.236;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(48376002)(50466002)(5008740100001)(122386002)(66066001)(81156007)(189998001)(33646002)(106466001)(5003940100001)(97736004)(92566002)(229853001)(6070500001)(50986999)(6806005)(50226001)(2351001)(110136002)(4001430100002)(107886002)(87936001)(40100003)(53416004)(85426001)(5001960100002)(86362001)(105606002)(86152002)(19580405001)(5007970100001)(5004730100002)(47776003)(11100500001)(19580395003)(16796002)(77096005)(7099028);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB1489;H:sj-itexedge04.altera.priv.altera.com;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:0;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1489;2:RczT9MF7S3btVA2Zyizup83Nj00phvPkHcEnTDUcEGxizjEiZFtC739ReV/IzOAa1DVUK5KTrVU9Y7oXvsbgoP7HqVyiyxQU6MhrsNCfTGsB4LRlIuJOamso7Q5TQAn3Fnf7eU2QUaxCuIPNCFwx8stUlB3f0Hl01x74v/55jks=;3:WaLjMhup72qwtJZfEf4Dpg9PmQeSXJQ9p1F32FD4JMCsbTkcVgsU9vQLBTaMhDRfPqOG0jEnwdOIGICMcGGqlmCng0CsUR9o0AUw/Vboqj9A845EabeIptL9Krv3G0VfihT/oF3isqwIQdTfZOnS1g23lzb29Kwaeq2QbWAOEOOiu5Rz+kqj/AmJ1ewcXw9hFeYY7BxZ8mXPiPWs91TQ9ModhLaFyR1DcLxicDuhSV0=;25:RTIbWbcbhwhFO8w07e9oEjkjtW8tBioP6IvvPApbEVB47QFS/ECwAB3ulU0iKQm295M7+SnawGxTRL/NK6xV13+aIRGBHY9iqR5RHcTv+zNQyDBz0J81/oUgLwkQlvhb2NFqPDFRxLwv3B4WWzrXP4MuvS7a8xXjXWu/lAO+sJFF3e98G/iIITLIHBvNsxekYWCa2DtpWbkoQ3PC80HTnD9ZvH0IXE3IdpmRZkffcGnM8tmVODt2wZvpUxzDhAfldVX0WFmgUB0/pPXZFi1/gg==;20:X1UO/s8SqOQb6OVXhthB/Rugk4FZReNCGwNsB8AsPxybJhRh3p6tE78uaui9OnVk5t3/81ZE4UjRv+DACvNtYT4Q7XGnc7XM6HuKbBMyJkVzQvAoC9nPYlatxMD66LTgbcIQWVLd7GOHb+uY/finfGdpJ2g887nVURVaf4ZcPaw= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1489; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1489;4:PzYyl2p7AUozTfCwm6CF0hY1d/qs8p/1j5PF1KHCo1iML1Yk025dfItaJbj+SY6HAYSHCMqyGeeZbEYrL+ngfXVsai5bFIEo9q42xAlGRTVASvLvnaYpi8NXFoc9JFLJKkro54tag9vzXPB4AjdnaMf/eF9lXq6mxmfnXUiZqsB2cGLae0Kq6bZEGMP3i4X4s2OTdd4QYN/jpphLjLczjRWe2JkfxCupufuWPhutORXIlF4RTWvpqODt/YCgkrHwFodl0/bPRfdVBWB2wSThUmQ4gj6KfceMSHmO/MS06vxHnuhomaEXNvK6cJTmC0Flbnt9nzeDlsasTajBU/nFE3HesFWm7OKDqU18nFeOLwI/q/Ij3qh4x5SlJUi4K6F1Nc+tAw6p+2ho4phIzm2l6g== X-Forefront-PRVS: 0744CFB5E8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB1489;23:mxQ67dF+dXPMe3Yn9xJv7wCJaF3AU6O3YDE4DZAHQ?= =?us-ascii?Q?X2wPQSvsVTNYmGSvvo3Wk4hkZRAozfw4VTiU6O07am2LxVSL5OB2pg+u3aPU?= =?us-ascii?Q?VrZy021y6kz4cYODq8B8fdQxlXw5PgUY1zCusGyjgDiy8a4LDugVsX5YU6Ji?= =?us-ascii?Q?j4bwDOp1r5JRLxxWTZcH8AkYFdbXTN2um1l0JTk7zMx2S5H4YEB4F2VkpQyK?= =?us-ascii?Q?Jv9GJ4FUaYixDyolw53+HyoQooy/N8oF9bQW0cuXwyiT/xT1umyogFqnrVGR?= =?us-ascii?Q?FFpZgvBtg/RysqBV+NAYbE4LyzteeMII+KiKouqcWyBYFukH6B96IvFnfshj?= =?us-ascii?Q?yV/lrqk0sblhFrlAoNWAIwmhSzfUq5q5C8qfRig5grrpRvmIrS3u/85S9BbP?= =?us-ascii?Q?ho/QPkMUGE2OUAQ+s+yloBTMgVqaz+HHbPi8+cUqgPudUX/czs8yRcxIA8l3?= =?us-ascii?Q?Yhap4z9s3TiLXTBc9IFnqblhmQ+Munxt5fg7OXqbChtbARcA+SRW/U8Kl+Y+?= =?us-ascii?Q?33triruDYc2hqmVisApyVWvhXPbBr3RLgUEaGc1FnDMK8bAbhQ1eixYKLavm?= =?us-ascii?Q?5PiWok7FtfeUVN2hsaG91ksRlBovZSBttzR8R4s4hbkocrR7BmSXBhpyoYGO?= =?us-ascii?Q?wFgRxGwmwHso/2Yj4yO6OPykGPHXslFbDIumoOBDV6ITf0YS30x0OUycS+ak?= =?us-ascii?Q?jjJmAFcKjTLAhjlASrnoyJvpaU75nx7jCgWxvAT1rCt3l763Ds8+amWfgJDJ?= =?us-ascii?Q?/Yz65UPiEc5EHOo/90UQFOyWScNqFRdNI6x7gk0/34sbK0VggDuXKagoB96g?= =?us-ascii?Q?NwV7nWPiEVgwtNjDNuWY1y0teoVMc+f7cxxG2g7+38V/vHV1QpP/DNhd0+BK?= =?us-ascii?Q?oG3HiAwZ80xpDSWNiaFbm5jaUO7JrU229qFLnAiWELMG79S1KYZc9O2no5OZ?= =?us-ascii?Q?UX4wu1FbWiRZckctliDXrmpiStD7SAH1Vv1g9Kjy+nTLDqbCsIy4/J4CfnmO?= =?us-ascii?Q?QwW/Of+pDmvsNEp4wS29XaVZkDNXpeeJL2XsaKl6V+z62R003OaTfrlVB+k+?= =?us-ascii?Q?x2duKiVdHpMyD2j3Mg/piM9T0hkN+/hkUtZeHUPCt7/sb8/+IqU5t28aklbs?= =?us-ascii?Q?h3s3mtcgzlsxfvoXbDKK5Hqb+v37DXL6siuXTQVFm95JYmvY280TGkzNcTQk?= =?us-ascii?Q?orhIdpm9JoLmSQRMDV02/YLWVtrD5EM2iWZ?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB1489;5:V95k1MQFaEGwU65u+RQm9IClktqFJ+6p4A4qqB3hgTq6o+WOmFblfDrGNHQGxQ+CVtdGwfWrAZzNZ6FwO/EFX9hb8Qu/mUTLCuXeDENMYE4fxcxxn6OfBZZ0B5X+BUPB2Bpr28ws7Mzqdg+dSJMOcg==;24:1wac8ex0fKP0Iqnh1w78Fi4B3SDEGB9a/0EVHg+A8pwcnJXl8wrQ0zPS0xQ8m9gaLI8AgOAPz2jh8uAwEA34nkHPYccLzHvIeb7zvZdSlU8=;20:C2wyHEmjBllGCERx/L/wzrFomj7htIBt0IJxIimnORJwOR0LO6MSt4itMhMheWFlf3YCXyV1a8op/GtYhrKhhIj+dq6xjyl5o7KaL3ynpXE5V8zwBMiAIViQY7UdUMo3vwUijfDogWmDMQyv9EnLpBtsQrZDIDBDTxEtkDaKt3w= X-OriginatorOrg: opensource.altera.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Oct 2015 19:46:49.4769 (UTC) X-MS-Exchange-CrossTenant-Id: fbd72e03-d4a5-4110-adce-614d51f2077a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=fbd72e03-d4a5-4110-adce-614d51f2077a;Ip=[66.35.236.236];Helo=[sj-itexedge04.altera.priv.altera.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB1489 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alan Tull Remove implementation of 'label' DT binding. Signed-off-by: Alan Tull --- drivers/fpga/fpga-mgr.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 45c41cb..f747311 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -257,7 +257,6 @@ int fpga_mgr_register(struct device *dev, const char *name, void *priv) { struct fpga_manager *mgr; - const char *dt_label; int id, ret; if (!mops || !mops->write_init || !mops->write || @@ -305,11 +304,9 @@ int fpga_mgr_register(struct device *dev, const char *name, mgr->dev.id = id; dev_set_drvdata(dev, mgr); - dt_label = of_get_property(mgr->dev.of_node, "label", NULL); - if (dt_label) - ret = dev_set_name(&mgr->dev, "%s", dt_label); - else - ret = dev_set_name(&mgr->dev, "fpga%d", id); + ret = dev_set_name(&mgr->dev, "fpga%d", id); + if (ret) + goto error_device; ret = device_add(&mgr->dev); if (ret) -- 1.7.9.5