From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751862AbdCACgU (ORCPT ); Tue, 28 Feb 2017 21:36:20 -0500 Received: from mail-dm3nam03on0061.outbound.protection.outlook.com ([104.47.41.61]:62088 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751460AbdCACes (ORCPT ); Tue, 28 Feb 2017 21:34:48 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=syeh@vmware.com; Date: Tue, 28 Feb 2017 11:49:41 -0800 From: Sinclair Yeh To: Joe Perches CC: Daniel Vetter , Patrik Jakobsson , Jani Nikula , Dave Airlie , Rob Clark , Ben Skeggs , Tomi Valkeinen , VMware Graphics , Thomas Hellstrom , David Airlie , , , , , , Subject: Re: [PATCH 3/3] gpu: drm: drivers: Convert printk(KERN_ to pr_ Message-ID: <20170228194941.GA26284@vmware.com> References: <76355db47b31668bb64d996865ceee53bd66b11f.1488285953.git.joe@perches.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <76355db47b31668bb64d996865ceee53bd66b11f.1488285953.git.joe@perches.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [208.91.1.34] X-ClientProxiedBy: CY4PR06CA0043.namprd06.prod.outlook.com (10.173.44.29) To MWHPR05MB3293.namprd05.prod.outlook.com (10.174.174.156) X-MS-Office365-Filtering-Correlation-Id: 0300653b-beab-4047-447b-08d4601334b8 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:MWHPR05MB3293; X-Microsoft-Exchange-Diagnostics: 1;MWHPR05MB3293;3:/2IKyiTM3hEJx+HIhY+bjxNtWZBvuHrFlvDZLhtXoDbeyxyXAjl4WbKs4JIIZvGSJkMTRhQgeFCWNg5g6nJ7niAGbgjFsDypYm77Ca/HUazyQifXCTzA5goQFNkn+8V9H37a0S5pI7JLkr1itmPsuLwMQwJf08Em6WrDpZ5fDtIQ2CznJuWxtBaAx6mpQy7N75NYN/au5p1SeBsk1QAJUbvRLUXAkGeTaKloKuN8F86YCg38JgXgjMHyku7M+La51bZmVdu5OK1GpnjLi0fJ/A==;25:7O49AJbUbmqo4DL7OGTmL1Gf78L8YPN0SJD55zA5zWMSWbsfr7CvMC4FPgUs8i71MLq5kwyYyE+bfPoZNDOOqYYn1ggSuUC7+/a23XapQUZC2X0DrnM5rwlwA8rAg/tvFhPDhNHTFexwAj1dCoU/HK9fefdSdkZ2YJQgFwU9O61B9VE+roSTMSvg4BlfDPUHNfSDZj1y1AqkIPUUYHlxLosPg70ijepZ8UT0jsOcp+c1FsCVaLS8a/8H/jZcVXEjBPoP3FtUCSs3SQvZuP+dl6t6Lb1lH8zZrHk1wssl3FHN9rksXigiJ8fmXbltgXvKcUZ4tNk3kzZuslp5/fdWJQIIV5N3Ee7JcTB6onE/svGEZPKmHHhMLiuOtXvkDKiZzEDxr3y5i0T4aXctxcw9BB9lzz2p5ZUEsGR/ZbYHyrJXMAgM+V0ea//CkmcUE6yrQJhWG0XZ7D13xB61ZuA48A== X-Microsoft-Exchange-Diagnostics: 1;MWHPR05MB3293;31:eV0LKE0PzDYhHMrfT23ZjWtOg74qKoahgb3tH7ykuBH7h/nJw08skwoIjQiP7LDnZ2HLVLNLngTt4C+b7+2pw4nXXqzukt8vxcnLwyvYI2h3oEfwpgauiD9wjPTFXDfiho81NT6YOSt9yQOkebMMVjaOXujWza3+I7hZVaBcBVyTypDtGvx9o84M0JvYmwoQjAB8plbP/bF0AHeQea1ePSkVxh5l1VsKad6LC4fU4J0cs0hbxqLnOrezy/MTjUWE;20:U7dpCJ/SUi5YQ8ssW52OVFCV07nVHFAxVNh7qcaLGj+7NVxFWuTMKL67/7zeQKzRy/t06JeVBFzBw77EjbqPM5PjGHLhBW+TbBiX0Vs92APvxEwQKcJ0dWcwjYiWr/M4xvA5Bti7hSLS3Mo5+Gq/2ncvczEGUGItVIIw9FmnLfnEQl+KFDbahyYHy2yGZJDduEdqZzGTSiYwFT1cMSmqrqF7yUi2puPEvCAzAk9Cw/THfSdglNJCQ/X1oJQNraMr9kcS9oPtuvSqONcpZr35MLUt97Etw25qlrp2sFNTqpENHRj8uj5fQuX53vXQd2O5pPyNDK83wwjbHCmwHKtafDOaue2YKRPn1T2bzy3OHCVum6KlYVtSdiyaSkUPTYj1uy+Abh1/L/aH16ZTNsj2ZIwNhC77c1GOJxc+r+rw51oKLefhbFnBhWBNC618pdt1ui3aoePSUjLPO1DqlLpTGKldkwwOQmbTuVi9pGDuMMrD0uUflROOZTfXXMXRfXjr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(61668805478150); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123562025)(20161123564025)(20161123555025)(6072148);SRVR:MWHPR05MB3293;BCL:0;PCL:0;RULEID:;SRVR:MWHPR05MB3293; X-Microsoft-Exchange-Diagnostics: 1;MWHPR05MB3293;4:Q/jM0nap++0EGPpU+MhBf71im+9oRMeaw8UKSimvE3C2ZaGlI0PUd6FN/NuTpWMVtUZXEkJ33VLGuVfa7PzCNyYUbECK4m19TQ8EOgbBb/t6+o2vgQ7Xh2l9q7JcP+askPJeevv6yyN3jh2hJN/m/BpfqYxGIgoKBPG1TtFQ+oeEEH8XkXjncs13Eka1uFYBpDFmYG+r6BnBVmtyAF2e19SqbN6B+Qz1L/IZ7ZNdYQNRpZRVnPJ70YqgVChlDzLlBD9INhG28JEYVWYujNaJJ4s2zXX5pcfv9NTcnz+SsFgxnNgiOd66KucXTAyeJsljeB36eL3EY4sE64bbi23BdLZUYTF3AbAF3wKRRBP9TWtwsW3TOMV78GvXeBay9vwj55E2qAffKqweDbpWgom5SP1gniotWE/HMnT9SJH790nL9eDwRQ7f6NfQedfehHqVwaRSZJ6r2JmQJCr/2f7kPl3r/O1crz18E8mWavigrLRvFB2YAYhrXNUSWstfbMH4xxpa+u2j4qYPS6s1Na5dJtiOVqW8bw2ZJsAIWzpb+ou9vz3VwExzM1+LK2qghhgbhGjnxjDc+mxp6ZCiIQiRdJm0Rx3qt66zJFxRcLcIrDk8ZibnsUUtQOZZPQ143Ujo+4kkaUfo9CM5RCEVouOrDw== X-Forefront-PRVS: 0232B30BBC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(24454002)(189002)(199003)(47776003)(6916009)(53936002)(66066001)(54356999)(76176999)(21086003)(38730400002)(105586002)(81156014)(69596002)(83506001)(81166006)(7736002)(305945005)(3846002)(6666003)(92566002)(4326008)(6246003)(2950100002)(50986999)(110136004)(42186005)(189998001)(8676002)(6116002)(54906002)(55016002)(25786008)(33656002)(7416002)(68736007)(229853002)(2906002)(101416001)(106356001)(46406003)(86362001)(97736004)(23726003)(36756003)(5660300001)(97756001)(4001350100001)(50466002)(1076002)(7099028)(18370500001);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR05MB3293;H:vmware.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR05MB3293;23:r/rqsfDy6PAeSCxBnZiE7OBdf8PoGgT4xa9U+u4bx?= =?us-ascii?Q?swLTDvnH+pyKpjjzP2UQHBIJfzF96PcnFVgGZE6cOJs8YZV69EoRW4W/hTfd?= =?us-ascii?Q?lrgiX/CMgAtgLI3ppgBQSlGFj/z7cpsHelTwJ8Vm9N2fG1Fpch692SAVQQ4b?= =?us-ascii?Q?WEppC9QA+NMcejJDmmNAoliw9Zl3BSvPjTFB+j+So3bjmwwQ8WM8x2PofBV5?= =?us-ascii?Q?IUa1uTepJYXdoEEFVpkhjxrWsohHh8gH+D6aeqds53EDKwS1v3zt7onwU8un?= =?us-ascii?Q?7TTQlN+hwdsLXfM0Q9PK23o3LOcjFasZXuCtgAbElbUm3Yjyd/9BMQ9iSV78?= =?us-ascii?Q?Fs4fyNZ70JyUvxtBXTCkaaXv98usgm4zfpn/EOrnYfy2tJrUcdMsqpzIR0ZX?= =?us-ascii?Q?gl6dpyj6Yx0YF3KyzzyX9BSj9NU8QL3OD/KovLv3/YGoLDUU9C8SKJis5B7l?= =?us-ascii?Q?y49XoWt/U7VWbwpy3vZAcPw2dZHsBp45GHHXR80nX7mmVbPwKJ7ZX34Q26Yi?= =?us-ascii?Q?9k3VV0tU4sFXPRDBZoW46j+IZXC583s+LZ6H+rfiJ0iAvYZVt9eNFpVKOMxs?= =?us-ascii?Q?u4OwR/hojbDmgEqldoyhnRU66ffugDqlU+94ojHYifjGEezpr15T+4M9ENZL?= =?us-ascii?Q?/m5kH9QUi4NTfftVp7bcgJd9jH7S4vdOZJ54syw9KM/mlz3jmOnX44ecg26g?= =?us-ascii?Q?2HprBt4BWKucIkcKreOebyT0MhwUxdb3aPQEnFqH3U3Zi/hxZ9TBTD1clYs6?= =?us-ascii?Q?zVgm7bNTzZiy+OBisW3qgSUrGWMcBZm269tfogw/ELGwFSFLjhga07+qiShD?= =?us-ascii?Q?KmRrW320a5whtAnB/uY9j+PcTbf4IsKFB9xYzfdInJXrn42UUNK9HwShPN7G?= =?us-ascii?Q?TZ5IIYu6J2Q+92tH/5aDdMQnDTOLNs4LkneabLzSR3mLNKgCtEyjpTFxvDbZ?= =?us-ascii?Q?SsT256CyQIt6ZZiOvWbmMJ6clhU4PkQg+s2mhbmj6hlhfPvRkQCN38Yj/PGp?= =?us-ascii?Q?SYgIPD+b3mSoZReTObk29qebF7qwhEXGyrifT596jHZ1YDk308w1Q9hbpW5C?= =?us-ascii?Q?5f4/9hcJruLZzJpnXzsbFybKc/CZ8/t9lCd/OI1rrfULJOfbiY/hGjmslXPP?= =?us-ascii?Q?QLB/6htR6iedLN7O2GFtJJFsOrHtVtfIKnQKGlPLPJg6SkXItsXyWpBJ0FNG?= =?us-ascii?Q?gpqcWL+NWHdoTn5RVsdjsXFNeSTTgwqm0Kuho9J4dQGUPQjG1DU9RCUJQbXg?= =?us-ascii?Q?YThK2/5apKjOC1BJUVcepfKnjE5m1m3tCaYrgWNgFYeiMib5MWbJ8PZiHn9j?= =?us-ascii?Q?6XjyDQAFiFOxggDk1KUmpHF4X1kigfCcXmaiAhSy1M1?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR05MB3293;6:9rQ4SeagUJMsKksYMalBusQNxjNQ75f0EFsLf+4nOnVAWgDQ21gV1NeWeryAXdd2UTLN8tLLNrTcZKW/oEEYOqGP8r3a1OP5Bf4GRm1uYzj0r1jggh0tuKGyRW/9T40ZUytxDl8A4nkmQWgHMRASzNgGk7m37eNfOEOAeGLVzYAGNZFgjDUabuk/6VpmTQH0rcRTMdI2XLbPvw0Z2aitmq5yevTTqlVzgb/1M7CEWoUX1gSp/c2FzDtT7pA3ATZKjI1a5/vFIY63ahsrNMRodCFonNMCRw8lGh5hKfJPkOS+fXTGzqn9V/ZgO8Qe+PT5QafbrUzYXgT/9NC9K11QZyHjw1csMPvoywvHL8f/lJRFUqk0VUIcVIayNRd7cX7UbdC2acqEiu29jZtpfkKt6A==;5:gNja1amLbn4yOqHuEp5dl6k1NpS94XTS/cP3WuDfR+xtDZ+hs24K9qBbdp9sLsP6zJhlmlkA56lIOWGASVR1xqQR5xPdWF9jqjkLoDG1rOE4qgaXzm3AYPfl2AzH5iLm0Ig9rBqyQogHGbIUYjqJNd/6mZfIjX02AsaQBXCDXgY=;24:9egL456Mg6d0kdFTo3UsRWjXNCIuFyhIJ6Sy418x4GD/QDCsTi7ZInazX4Epg77z622AlbexptszHDE41wRPm91u8X6xVcZ8pK7NeQTLDfw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR05MB3293;7:AF+12CbEmxH3yjYecnLmUp3VViByXGb7JBCxgHyXqFOsYn2yw6wnDpkYDhzydXa9CfyK8WvPTxN3FENmT6lw1hsGlo11TXCb84gQ+xFWUPz/ieER68oDMdp2F0COZ4R1LudYXXSF3qnTOt6z9atx5NztBmjxQ6mtZHRiOHsneTK4ACX5HxCudIpOZtiKvG+bp4PVdXBffOIw0aiy594NGAusRXsP6R/JhZ/NUHKhMZbtrdiV8LmvEoRyNV/2tdzIROWMu1lRSHR3elHKB1avxNzG2sbzTVdC8Ohd+BlMmShcc49QlfdnM475KpBrHmmXoe9Wkgc+IwIr+YPmrbG+0g==;20:NpLF3pX50oNDO80Y6thQwHaQOWtgFaBT0jxde1uE8rrFRLGPpsvd6Q0LhpsXyvuvZd0scLH7w7clsqnXIB02SkyiPRoIOh+9QUqPpHA1HlhyV6Qy64d64sqwKs3yPB7fRXNS3ZjkJ4YosYAHNeD4BkVFxxlJzaWYTH8YsQsdblg= X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2017 19:51:35.8249 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR05MB3293 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For drm/vmwgfx: Acked-by: Sinclair Yeh On Tue, Feb 28, 2017 at 04:55:54AM -0800, Joe Perches wrote: > Use a more common logging style. > > Miscellanea: > > o Coalesce formats and realign arguments > o Neaten a few macros now using pr_ > > Signed-off-by: Joe Perches > --- > drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 ++++----- > drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +++++++++--------- > drivers/gpu/drm/gma500/psb_drv.h | 5 ++--- > drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 +++---- > drivers/gpu/drm/i915/i915_sw_fence.c | 8 ++++---- > drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- > drivers/gpu/drm/msm/msm_drv.c | 2 +- > drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 ++++--- > drivers/gpu/drm/nouveau/nouveau_vga.c | 4 ++-- > drivers/gpu/drm/nouveau/nv50_display.c | 22 +++++++++++----------- > drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 +++++----- > drivers/gpu/drm/omapdrm/dss/dsi.c | 17 ++++++++--------- > drivers/gpu/drm/omapdrm/dss/dss.c | 3 +-- > drivers/gpu/drm/omapdrm/dss/dss.h | 15 ++++++--------- > drivers/gpu/drm/omapdrm/omap_gem.c | 5 ++--- > drivers/gpu/drm/r128/r128_cce.c | 7 +++---- > drivers/gpu/drm/ttm/ttm_bo.c | 2 +- > drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 ++---- > drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +-- > drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 ++-- > 20 files changed, 72 insertions(+), 84 deletions(-) > > diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c > index 5efdb7fbb7ee..e64960db3224 100644 > --- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c > +++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c > @@ -284,8 +284,7 @@ static bool cdv_intel_lvds_mode_fixup(struct drm_encoder *encoder, > head) { > if (tmp_encoder != encoder > && tmp_encoder->crtc == encoder->crtc) { > - printk(KERN_ERR "Can't enable LVDS and another " > - "encoder on the same pipe\n"); > + pr_err("Can't enable LVDS and another encoder on the same pipe\n"); > return false; > } > } > @@ -756,13 +755,13 @@ void cdv_intel_lvds_init(struct drm_device *dev, > > failed_find: > mutex_unlock(&dev->mode_config.mutex); > - printk(KERN_ERR "Failed find\n"); > + pr_err("Failed find\n"); > psb_intel_i2c_destroy(gma_encoder->ddc_bus); > failed_ddc: > - printk(KERN_ERR "Failed DDC\n"); > + pr_err("Failed DDC\n"); > psb_intel_i2c_destroy(gma_encoder->i2c_bus); > failed_blc_i2c: > - printk(KERN_ERR "Failed BLC\n"); > + pr_err("Failed BLC\n"); > drm_encoder_cleanup(encoder); > drm_connector_cleanup(connector); > kfree(lvds_priv); > diff --git a/drivers/gpu/drm/gma500/oaktrail_lvds.c b/drivers/gpu/drm/gma500/oaktrail_lvds.c > index f7038f12ac76..e6943fef0611 100644 > --- a/drivers/gpu/drm/gma500/oaktrail_lvds.c > +++ b/drivers/gpu/drm/gma500/oaktrail_lvds.c > @@ -255,15 +255,15 @@ static void oaktrail_lvds_get_configuration_mode(struct drm_device *dev, > ((ti->vblank_hi << 8) | ti->vblank_lo); > mode->clock = ti->pixel_clock * 10; > #if 0 > - printk(KERN_INFO "hdisplay is %d\n", mode->hdisplay); > - printk(KERN_INFO "vdisplay is %d\n", mode->vdisplay); > - printk(KERN_INFO "HSS is %d\n", mode->hsync_start); > - printk(KERN_INFO "HSE is %d\n", mode->hsync_end); > - printk(KERN_INFO "htotal is %d\n", mode->htotal); > - printk(KERN_INFO "VSS is %d\n", mode->vsync_start); > - printk(KERN_INFO "VSE is %d\n", mode->vsync_end); > - printk(KERN_INFO "vtotal is %d\n", mode->vtotal); > - printk(KERN_INFO "clock is %d\n", mode->clock); > + pr_info("hdisplay is %d\n", mode->hdisplay); > + pr_info("vdisplay is %d\n", mode->vdisplay); > + pr_info("HSS is %d\n", mode->hsync_start); > + pr_info("HSE is %d\n", mode->hsync_end); > + pr_info("htotal is %d\n", mode->htotal); > + pr_info("VSS is %d\n", mode->vsync_start); > + pr_info("VSE is %d\n", mode->vsync_end); > + pr_info("vtotal is %d\n", mode->vtotal); > + pr_info("clock is %d\n", mode->clock); > #endif > mode_dev->panel_fixed_mode = mode; > } > diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h > index 83e22fd4cfc0..83667087d6e5 100644 > --- a/drivers/gpu/drm/gma500/psb_drv.h > +++ b/drivers/gpu/drm/gma500/psb_drv.h > @@ -905,9 +905,8 @@ static inline void REGISTER_WRITE8(struct drm_device *dev, > #define PSB_RSGX32(_offs) \ > ({ \ > if (inl(dev_priv->apm_base + PSB_APM_STS) & 0x3) { \ > - printk(KERN_ERR \ > - "access sgx when it's off!! (READ) %s, %d\n", \ > - __FILE__, __LINE__); \ > + pr_err("access sgx when it's off!! (READ) %s, %d\n", \ > + __FILE__, __LINE__); \ > melay(1000); \ > } \ > ioread32(dev_priv->sgx_reg + (_offs)); \ > diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c > index 483fdce74e39..0066fe7e622e 100644 > --- a/drivers/gpu/drm/gma500/psb_intel_lvds.c > +++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c > @@ -388,11 +388,11 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, > > /* PSB requires the LVDS is on pipe B, MRST has only one pipe anyway */ > if (!IS_MRST(dev) && gma_crtc->pipe == 0) { > - printk(KERN_ERR "Can't support LVDS on pipe A\n"); > + pr_err("Can't support LVDS on pipe A\n"); > return false; > } > if (IS_MRST(dev) && gma_crtc->pipe != 0) { > - printk(KERN_ERR "Must use PIPE A\n"); > + pr_err("Must use PIPE A\n"); > return false; > } > /* Should never happen!! */ > @@ -400,8 +400,7 @@ bool psb_intel_lvds_mode_fixup(struct drm_encoder *encoder, > head) { > if (tmp_encoder != encoder > && tmp_encoder->crtc == encoder->crtc) { > - printk(KERN_ERR "Can't enable LVDS and another " > - "encoder on the same pipe\n"); > + pr_err("Can't enable LVDS and another encoder on the same pipe\n"); > return false; > } > } > diff --git a/drivers/gpu/drm/i915/i915_sw_fence.c b/drivers/gpu/drm/i915/i915_sw_fence.c > index 40f4e5efaf83..a277f8eb7beb 100644 > --- a/drivers/gpu/drm/i915/i915_sw_fence.c > +++ b/drivers/gpu/drm/i915/i915_sw_fence.c > @@ -395,10 +395,10 @@ static void timer_i915_sw_fence_wake(unsigned long data) > { > struct i915_sw_dma_fence_cb *cb = (struct i915_sw_dma_fence_cb *)data; > > - printk(KERN_WARNING "asynchronous wait on fence %s:%s:%x timed out\n", > - cb->dma->ops->get_driver_name(cb->dma), > - cb->dma->ops->get_timeline_name(cb->dma), > - cb->dma->seqno); > + pr_warn("asynchronous wait on fence %s:%s:%x timed out\n", > + cb->dma->ops->get_driver_name(cb->dma), > + cb->dma->ops->get_timeline_name(cb->dma), > + cb->dma->seqno); > dma_fence_put(cb->dma); > cb->dma = NULL; > > diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c > index 3938120e5051..f2e9b2bc18a5 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_mode.c > +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c > @@ -195,7 +195,7 @@ static int mga_g200se_set_plls(struct mga_device *mdev, long clock) > } > > if (delta > permitteddelta) { > - printk(KERN_WARNING "PLL delta too large\n"); > + pr_warn("PLL delta too large\n"); > return 1; > } > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > index 70226eaa5cac..462e7d5bd872 100644 > --- a/drivers/gpu/drm/msm/msm_drv.c > +++ b/drivers/gpu/drm/msm/msm_drv.c > @@ -152,7 +152,7 @@ u32 msm_readl(const void __iomem *addr) > { > u32 val = readl(addr); > if (reglog) > - printk(KERN_ERR "IO:R %p %08x\n", addr, val); > + pr_err("IO:R %p %08x\n", addr, val); > return val; > } > > diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c > index 193573d191e5..39468c218027 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c > +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c > @@ -326,7 +326,7 @@ static bool nouveau_dsm_detect(void) > nouveau_dsm_priv.dhandle = dhandle; > acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, > &buffer); > - printk(KERN_INFO "VGA switcheroo: detected Optimus DSM method %s handle\n", > + pr_info("VGA switcheroo: detected Optimus DSM method %s handle\n", > acpi_method_name); > if (has_power_resources) > pr_info("nouveau: detected PR support, will not use DSM\n"); > @@ -338,7 +338,7 @@ static bool nouveau_dsm_detect(void) > nouveau_dsm_priv.dhandle = dhandle; > acpi_get_name(nouveau_dsm_priv.dhandle, ACPI_FULL_PATHNAME, > &buffer); > - printk(KERN_INFO "VGA switcheroo: detected DSM switching method %s handle\n", > + pr_info("VGA switcheroo: detected DSM switching method %s handle\n", > acpi_method_name); > nouveau_dsm_priv.dsm_detected = true; > ret = true; > @@ -406,7 +406,8 @@ static int nouveau_rom_call(acpi_handle rom_handle, uint8_t *bios, > > status = acpi_evaluate_object(rom_handle, NULL, &rom_arg, &buffer); > if (ACPI_FAILURE(status)) { > - printk(KERN_INFO "failed to evaluate ROM got %s\n", acpi_format_exception(status)); > + pr_info("failed to evaluate ROM got %s\n", > + acpi_format_exception(status)); > return -ENODEV; > } > obj = (union acpi_object *)buffer.pointer; > diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c > index eef22c6b9665..ccb597eac538 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_vga.c > +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c > @@ -41,13 +41,13 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev, > return; > > if (state == VGA_SWITCHEROO_ON) { > - printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); > + pr_err("VGA switcheroo: switched nouveau on\n"); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > nouveau_pmops_resume(&pdev->dev); > drm_kms_helper_poll_enable(dev); > dev->switch_power_state = DRM_SWITCH_POWER_ON; > } else { > - printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); > + pr_err("VGA switcheroo: switched nouveau off\n"); > dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; > drm_kms_helper_poll_disable(dev); > nouveau_switcheroo_optimus_dsm(); > diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c > index 0b4440ffbeae..ff7437b2762d 100644 > --- a/drivers/gpu/drm/nouveau/nv50_display.c > +++ b/drivers/gpu/drm/nouveau/nv50_display.c > @@ -705,7 +705,7 @@ evo_wait(void *evoc, int nr) > break; > ) < 0) { > mutex_unlock(&dmac->lock); > - printk(KERN_ERR "nouveau: evo channel stalled\n"); > + pr_err("nouveau: evo channel stalled\n"); > return NULL; > } > > @@ -723,18 +723,18 @@ evo_kick(u32 *push, void *evoc) > mutex_unlock(&dmac->lock); > } > > -#define evo_mthd(p,m,s) do { \ > - const u32 _m = (m), _s = (s); \ > - if (drm_debug & DRM_UT_KMS) \ > - printk(KERN_ERR "%04x %d %s\n", _m, _s, __func__); \ > - *((p)++) = ((_s << 18) | _m); \ > +#define evo_mthd(p, m, s) do { \ > + const u32 _m = (m), _s = (s); \ > + if (drm_debug & DRM_UT_KMS) \ > + pr_err("%04x %d %s\n", _m, _s, __func__); \ > + *((p)++) = ((_s << 18) | _m); \ > } while(0) > > -#define evo_data(p,d) do { \ > - const u32 _d = (d); \ > - if (drm_debug & DRM_UT_KMS) \ > - printk(KERN_ERR "\t%08x\n", _d); \ > - *((p)++) = _d; \ > +#define evo_data(p, d) do { \ > + const u32 _d = (d); \ > + if (drm_debug & DRM_UT_KMS) \ > + pr_err("\t%08x\n", _d); \ > + *((p)++) = _d; \ > } while(0) > > /****************************************************************************** > diff --git a/drivers/gpu/drm/nouveau/nvkm/core/mm.c b/drivers/gpu/drm/nouveau/nvkm/core/mm.c > index fd19d652a7ab..5c7891234eea 100644 > --- a/drivers/gpu/drm/nouveau/nvkm/core/mm.c > +++ b/drivers/gpu/drm/nouveau/nvkm/core/mm.c > @@ -31,15 +31,15 @@ nvkm_mm_dump(struct nvkm_mm *mm, const char *header) > { > struct nvkm_mm_node *node; > > - printk(KERN_ERR "nvkm: %s\n", header); > - printk(KERN_ERR "nvkm: node list:\n"); > + pr_err("nvkm: %s\n", header); > + pr_err("nvkm: node list:\n"); > list_for_each_entry(node, &mm->nodes, nl_entry) { > - printk(KERN_ERR "nvkm: \t%08x %08x %d\n", > + pr_err("nvkm: \t%08x %08x %d\n", > node->offset, node->length, node->type); > } > - printk(KERN_ERR "nvkm: free list:\n"); > + pr_err("nvkm: free list:\n"); > list_for_each_entry(node, &mm->free, fl_entry) { > - printk(KERN_ERR "nvkm: \t%08x %08x %d\n", > + pr_err("nvkm: \t%08x %08x %d\n", > node->offset, node->length, node->type); > } > } > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index f74615d005a8..5e51a5649efb 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -582,15 +582,14 @@ static void dsi_perf_show(struct platform_device *dsidev, const char *name) > > total_bytes = dsi->update_bytes; > > - printk(KERN_INFO "DSI(%s): %u us + %u us = %u us (%uHz), " > - "%u bytes, %u kbytes/sec\n", > - name, > - setup_us, > - trans_us, > - total_us, > - 1000*1000 / total_us, > - total_bytes, > - total_bytes * 1000 / total_us); > + pr_info("DSI(%s): %u us + %u us = %u us (%uHz), %u bytes, %u kbytes/sec\n", > + name, > + setup_us, > + trans_us, > + total_us, > + 1000 * 1000 / total_us, > + total_bytes, > + total_bytes * 1000 / total_us); > } > #else > static inline void dsi_perf_mark_setup(struct platform_device *dsidev) > diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c > index 14887d5b02e5..4e72d2fefb4d 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dss.c > +++ b/drivers/gpu/drm/omapdrm/dss/dss.c > @@ -1254,8 +1254,7 @@ static int dss_bind(struct device *dev) > dss.lcd_clk_source[1] = DSS_CLK_SRC_FCK; > > rev = dss_read_reg(DSS_REVISION); > - printk(KERN_INFO "OMAP DSS rev %d.%d\n", > - FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); > + pr_info("OMAP DSS rev %d.%d\n", FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0)); > > dss_runtime_put(); > > diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h > index 56493b290731..78f6fc75948b 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dss.h > +++ b/drivers/gpu/drm/omapdrm/dss/dss.h > @@ -42,29 +42,26 @@ > > #ifdef DSS_SUBSYS_NAME > #define DSSERR(format, ...) \ > - printk(KERN_ERR "omapdss " DSS_SUBSYS_NAME " error: " format, \ > - ## __VA_ARGS__) > + pr_err("omapdss " DSS_SUBSYS_NAME " error: " format, ##__VA_ARGS__) > #else > #define DSSERR(format, ...) \ > - printk(KERN_ERR "omapdss error: " format, ## __VA_ARGS__) > + pr_err("omapdss error: " format, ##__VA_ARGS__) > #endif > > #ifdef DSS_SUBSYS_NAME > #define DSSINFO(format, ...) \ > - printk(KERN_INFO "omapdss " DSS_SUBSYS_NAME ": " format, \ > - ## __VA_ARGS__) > + pr_info("omapdss " DSS_SUBSYS_NAME ": " format, ##__VA_ARGS__) > #else > #define DSSINFO(format, ...) \ > - printk(KERN_INFO "omapdss: " format, ## __VA_ARGS__) > + pr_info("omapdss: " format, ## __VA_ARGS__) > #endif > > #ifdef DSS_SUBSYS_NAME > #define DSSWARN(format, ...) \ > - printk(KERN_WARNING "omapdss " DSS_SUBSYS_NAME ": " format, \ > - ## __VA_ARGS__) > + pr_warn("omapdss " DSS_SUBSYS_NAME ": " format, ##__VA_ARGS__) > #else > #define DSSWARN(format, ...) \ > - printk(KERN_WARNING "omapdss: " format, ## __VA_ARGS__) > + pr_warn("omapdss: " format, ##__VA_ARGS__) > #endif > > /* OMAP TRM gives bitfields as start:end, where start is the higher bit > diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c > index 5d5a9f517c30..68a75b829b71 100644 > --- a/drivers/gpu/drm/omapdrm/omap_gem.c > +++ b/drivers/gpu/drm/omapdrm/omap_gem.c > @@ -1107,9 +1107,8 @@ static inline bool is_waiting(struct omap_gem_sync_waiter *waiter) > > /* macro for sync debug.. */ > #define SYNCDBG 0 > -#define SYNC(fmt, ...) do { if (SYNCDBG) \ > - printk(KERN_ERR "%s:%d: "fmt"\n", \ > - __func__, __LINE__, ##__VA_ARGS__); \ > +#define SYNC(fmt, ...) do { if (SYNCDBG) \ > + pr_err("%s:%d: " fmt "\n", __func__, __LINE__, ##__VA_ARGS__); \ > } while (0) > > > diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c > index 14fd83b5f497..c9890afe69d6 100644 > --- a/drivers/gpu/drm/r128/r128_cce.c > +++ b/drivers/gpu/drm/r128/r128_cce.c > @@ -149,20 +149,19 @@ static int r128_cce_load_microcode(drm_r128_private_t *dev_priv) > > pdev = platform_device_register_simple("r128_cce", 0, NULL, 0); > if (IS_ERR(pdev)) { > - printk(KERN_ERR "r128_cce: Failed to register firmware\n"); > + pr_err("r128_cce: Failed to register firmware\n"); > return PTR_ERR(pdev); > } > rc = request_firmware(&fw, FIRMWARE_NAME, &pdev->dev); > platform_device_unregister(pdev); > if (rc) { > - printk(KERN_ERR "r128_cce: Failed to load firmware \"%s\"\n", > + pr_err("r128_cce: Failed to load firmware \"%s\"\n", > FIRMWARE_NAME); > return rc; > } > > if (fw->size != 256 * 8) { > - printk(KERN_ERR > - "r128_cce: Bogus length %zu in firmware \"%s\"\n", > + pr_err("r128_cce: Bogus length %zu in firmware \"%s\"\n", > fw->size, FIRMWARE_NAME); > rc = -EINVAL; > goto out_release; > diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c > index 17478f38dea3..dca2e809a970 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo.c > +++ b/drivers/gpu/drm/ttm/ttm_bo.c > @@ -982,7 +982,7 @@ int ttm_bo_mem_space(struct ttm_buffer_object *bo, > } > > if (!type_found) { > - printk(KERN_ERR TTM_PFX "No compatible memory type found.\n"); > + pr_err(TTM_PFX "No compatible memory type found\n"); > return -EINVAL; > } > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > index 6541dd8b82dc..b399f03a988d 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c > @@ -728,8 +728,7 @@ int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data, > > base = ttm_base_object_lookup(tfile, arg->handle); > if (unlikely(base == NULL)) { > - printk(KERN_ERR "Wait invalid fence object handle " > - "0x%08lx.\n", > + pr_err("Wait invalid fence object handle 0x%08lx\n", > (unsigned long)arg->handle); > return -EINVAL; > } > @@ -773,8 +772,7 @@ int vmw_fence_obj_signaled_ioctl(struct drm_device *dev, void *data, > > base = ttm_base_object_lookup(tfile, arg->handle); > if (unlikely(base == NULL)) { > - printk(KERN_ERR "Fence signaled invalid fence object handle " > - "0x%08lx.\n", > + pr_err("Fence signaled invalid fence object handle 0x%08lx\n", > (unsigned long)arg->handle); > return -EINVAL; > } > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > index fec7348cea2c..c1900f4390a4 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c > @@ -159,8 +159,7 @@ static int vmw_gmrid_man_takedown(struct ttm_mem_type_manager *man) > static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man, > const char *prefix) > { > - printk(KERN_INFO "%s: No debug info available for the GMR " > - "id manager.\n", prefix); > + pr_info("%s: No debug info available for the GMR id manager\n", prefix); > } > > const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = { > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > index 65b3f0369636..27033d944b08 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c > @@ -736,14 +736,14 @@ int vmw_user_dmabuf_lookup(struct ttm_object_file *tfile, > > base = ttm_base_object_lookup(tfile, handle); > if (unlikely(base == NULL)) { > - printk(KERN_ERR "Invalid buffer object handle 0x%08lx.\n", > + pr_err("Invalid buffer object handle 0x%08lx\n", > (unsigned long)handle); > return -ESRCH; > } > > if (unlikely(ttm_base_object_type(base) != ttm_buffer_type)) { > ttm_base_object_unref(&base); > - printk(KERN_ERR "Invalid buffer object handle 0x%08lx.\n", > + pr_err("Invalid buffer object handle 0x%08lx\n", > (unsigned long)handle); > return -EINVAL; > } > -- > 2.10.0.rc2.1.g053435c >