From patchwork Thu Sep 12 07:00:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 2876521 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 050C29F486 for ; Thu, 12 Sep 2013 07:00:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B86EE2021E for ; Thu, 12 Sep 2013 07:00:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91C162021C for ; Thu, 12 Sep 2013 07:00:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753143Ab3ILHAk (ORCPT ); Thu, 12 Sep 2013 03:00:40 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:60879 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751591Ab3ILHAj (ORCPT ); Thu, 12 Sep 2013 03:00:39 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MT000M0L3GV9DK0@mailout4.samsung.com> for linux-fbdev@vger.kernel.org; Thu, 12 Sep 2013 16:00:31 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id CB.B9.20109.F8661325; Thu, 12 Sep 2013 16:00:31 +0900 (KST) X-AuditID: cbfee68f-b7f1e6d000004e8d-bc-5231668f59ae Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id EC.07.09055.E8661325; Thu, 12 Sep 2013 16:00:31 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MT000JY13GUQF30@mmp2.samsung.com>; Thu, 12 Sep 2013 16:00:30 +0900 (KST) From: Jingoo Han To: 'Jean-Christophe PLAGNIOL-VILLARD' Cc: 'Tomi Valkeinen' , linux-fbdev@vger.kernel.org, 'Jingoo Han' , 'Thomas Winischhofer' References: <001a01ceaf84$32c52d90$984f88b0$%han@samsung.com> In-reply-to: <001a01ceaf84$32c52d90$984f88b0$%han@samsung.com> Subject: [PATCH 18/21] video: sisfb: remove unnecessary pci_set_drvdata() Date: Thu, 12 Sep 2013 16:00:31 +0900 Message-id: <002c01ceaf85$c51cc030$4f564090$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac6vhDKuTCwbnQ4aTDC9KoLwWMziagAAXbWw Content-language: ko x-cr-hashedpuzzle: DVLA DV1q HO5t LUfm NmGk OCOJ O/c+ P75e S4fR TYfm bAfR dwVL lbeh n6Jy ql5w 3fsu; 5; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA7AGwAaQBuAHUAeAAtAGYAYgBkAGUAdgBAAHYAZwBlAHIALgBrAGUAcgBuAGUAbAAuAG8AcgBnADsAcABsAGEAZwBuAGkAbwBqAEAAagBjAHIAbwBzAG8AZgB0AC4AYwBvAG0AOwB0AGgAbwBtAGEAcwBAAHcAaQBuAGkAcwBjAGgAaABvAGYAZQByAC4AbgBlAHQAOwB0AG8AbQBpAC4AdgBhAGwAawBlAGkAbgBlAG4AQAB0AGkALgBjAG8AbQA=; Sosha1_v1; 7; {57CF160B-7CD2-460F-A3B3-2ECDE60B12C9}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Thu, 12 Sep 2013 07:00:22 GMT; WwBQAEEAVABDAEgAIAAxADgALwAyADEAXQAgAHYAaQBkAGUAbwA6ACAAcwBpAHMAZgBiADoAIAByAGUAbQBvAHYAZQAgAHUAbgBuAGUAYwBlAHMAcwBhAHIAeQAgAHAAYwBpAF8AcwBlAHQAXwBkAHIAdgBkAGEAdABhACgAKQA= x-cr-puzzleid: {57CF160B-7CD2-460F-A3B3-2ECDE60B12C9} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsVy+t8zfd3+NMMgg/fn2SwuL7zEanGi7wOr xbqHL5gsVq98zG6xfv4tNgdWj1cX7rB49G1Zxehx/MZ2Jo/Pm+Q8Fsz4zxLAGsVlk5Kak1mW WqRvl8CVcen5RaaCm1wV9za3MjUwvuHoYuTkkBAwkXh+rI0JwhaTuHBvPVsXIxeHkMAyRoml H/exwRTN2NrNDJGYzijRP/ECK4Tzi1Fiz8+dzCBVbAJqEl++HGYHsUUE7CQWXrwEVsQssIhR Ytrn32CjhARsJZa+uc0CYnMCFX05thAsLizgKbFs9x+wQSwCqhIHji1nBLF5geo/LZrNBmEL SvyYfA+sl1lAS2L9zuNMELa8xOY1b4F6OYBOVZd49FcX4gYjiSU9X9kgSkQk9r14xwjxzRVW ibX/IyDKTSWWHU4FOVNC4Cu7xJr719ggThCQ+Db5EAtEjazEpgPMEK2SEgdX3GCZwCg1C8lB s5AcNAvJQbOQbF7AyLKKUTS1ILmgOCm9yFivODG3uDQvXS85P3cTIyS2+3cw3j1gfYgxGWj9 RGYp0eR8YGrIK4k3NDYzsjA1MTU2Mrc0I01YSZxXrcU6UEggPbEkNTs1tSC1KL6oNCe1+BAj EwenVAPjrPvCs9/XRtaIz3oWpi82m0eiwO9++86ph+dYp3ppep/ZuV2n1T3J5/elI9cynMMm ervMuxz0+8Yj/+Dm46ybDdr8N0ZkKwiLfMzS1VEUS/y2pjjsYsqRqQ5KHN7W1j/Zpc4GMSv0 8bEf/p+g5PuiJJ3RTcsk9asr373VqXOr+XzsZx65xq3EUpyRaKjFXFScCAAesLlJAwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLKsWRmVeSWpSXmKPExsVy+t9jQd3+NMMgg4mPGS0uL7zEanGi7wOr xbqHL5gsVq98zG6xfv4tNgdWj1cX7rB49G1Zxehx/MZ2Jo/Pm+Q8Fsz4zxLAGtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjHmHHp+UWmgptcFfc2tzI1ML7h6GLk5JAQMJGY sbWbGcIWk7hwbz1bFyMXh5DAdEaJ/okXWCGcX4wSe37uBKtiE1CT+PLlMDuILSJgJ7Hw4iWw ImaBRYwS0z7/ZgNJCAnYSix9c5sFxOYEKvpybCFYXFjAU2LZ7j9gg1gEVCUOHFvOCGLzAtV/ WjSbDcIWlPgx+R5YL7OAlsT6nceZIGx5ic1r3gL1cgCdqi7x6K8uxA1GEkt6vrJBlIhI7Hvx jhHimyusEmv/R0CUm0osO5w6gVFkFpIFs5AsmIVkwSwkkxYwsqxiFE0tSC4oTkrPNdQrTswt Ls1L10vOz93ECE4cz6R2MK5ssDjEKMDBqMTD2zHLIEiINbGsuDL3EKMEB7OSCG+8uWGQEG9K YmVValF+fFFpTmrxIcZkoP8nMkuJJucDk1peSbyhsYmZkaWRmYWRibk5acJK4rwHWq0DhQTS E0tSs1NTC1KLYLYwcXBKNTCWMKYmSc5km990a8rx/Ry9NssY17HGpPDo7jBzcTupmDZtST7n plZ786v7zAT4Tz09tWPZyjDPsLR0/gMmMa77eHRUzSOdQ17qhn1SV1G79Ujt5g5t8yutC6MV O7p3n7zTEK248bmS/9x9asW5D2p1Ojd7BCwLtudpfnV6Qv+W2WsDXlxtaVRiKc5INNRiLipO BAAAC/fTYAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The driver core clears the driver data to NULL after device_release or on probe failure. Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han --- drivers/video/sis/sis_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 977e279..793b402 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -5994,7 +5994,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if(!ivideo->sisvga_enabled) { if(pci_enable_device(pdev)) { if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); - pci_set_drvdata(pdev, NULL); framebuffer_release(sis_fb_info); return -EIO; } @@ -6211,7 +6210,6 @@ error_3: vfree(ivideo->bios_abase); pci_dev_put(ivideo->lpcdev); if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); - pci_set_drvdata(pdev, NULL); if(!ivideo->sisvga_enabled) pci_disable_device(pdev); framebuffer_release(sis_fb_info); @@ -6523,8 +6521,6 @@ static void sisfb_remove(struct pci_dev *pdev) mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size); #endif - pci_set_drvdata(pdev, NULL); - /* If device was disabled when starting, disable * it when quitting. */