From nobody Sat Apr 11 13:05:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D64EC61DA4 for ; Mon, 6 Mar 2023 16:05:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229618AbjCFQFu (ORCPT ); Mon, 6 Mar 2023 11:05:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231486AbjCFQBD (ORCPT ); Mon, 6 Mar 2023 11:01:03 -0500 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A2CA32536; Mon, 6 Mar 2023 08:00:55 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 2F29C1FED3; Mon, 6 Mar 2023 16:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678118454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ux309O9TgXMG2iCBc1Nlc/YxhMdiiSbk+pPPbR4+wSE=; b=cHlFCGgJRl+TL9ujL2GCiY/0xCP8fnBUYJtSh+N5u85Rey0kAdvey/59LQWamzYXr5LbQ9 64remF5e5rxpYVPk1VHlnqHwlhn5OYxcOY0ne2fZY9gIYuzjgWwzdbtApSif+ojT+vYyeL PAC4E+rYNLhR52VmHMnE9TRvMHvm/Ug= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678118454; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ux309O9TgXMG2iCBc1Nlc/YxhMdiiSbk+pPPbR4+wSE=; b=KwHPi0tLBMnCHIKI6wKS+3sFnrFfSJTY51Wd8T5PNQHKE2QBOm4LbnGGKiwdeSedYi2hid eaoDeD+BL09No/AA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C620613513; Mon, 6 Mar 2023 16:00:53 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id SA+XLzUOBmQ/PwAAMHmgww (envelope-from ); Mon, 06 Mar 2023 16:00:53 +0000 From: Thomas Zimmermann To: deller@gmx.de, paulus@samba.org, benh@kernel.crashing.org, linux@armlinux.org.uk, pjones@redhat.com, timur@kernel.org, adaplas@gmail.com, s.hauer@pengutronix.de, shawnguo@kernel.org, mbroemme@libmpq.org, thomas@winischhofer.net, James.Bottomley@HansenPartnership.com, spock@gentoo.org, sudipm.mukherjee@gmail.com, teddy.wang@siliconmotion.com, geert+renesas@glider.be, corbet@lwn.net Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Thomas Zimmermann Subject: [PATCH 78/99] fbdev/stifb: Remove trailing whitespaces Date: Mon, 6 Mar 2023 16:59:55 +0100 Message-Id: <20230306160016.4459-79-tzimmermann@suse.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306160016.4459-1-tzimmermann@suse.de> References: <20230306160016.4459-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Fix coding style. No functional changes. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/stifb.c | 156 ++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 78 deletions(-) diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index 3feb6e40d56d..a151377f5b45 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -1,11 +1,11 @@ /* - * linux/drivers/video/stifb.c -=20 - * Low level Frame buffer driver for HP workstations with=20 + * linux/drivers/video/stifb.c - + * Low level Frame buffer driver for HP workstations with * STI (standard text interface) video firmware. * * Copyright (C) 2001-2006 Helge Deller * Portions Copyright (C) 2001 Thomas Bogendoerfer - *=20 + * * Based on: * - linux/drivers/video/artistfb.c -- Artist frame buffer driver * Copyright (C) 2000 Philipp Rumpf @@ -14,7 +14,7 @@ * - HP Xhp cfb-based X11 window driver for XFree86 * (c)Copyright 1992 Hewlett-Packard Co. * - *=20 + * * The following graphics display devices (NGLE family) are supported by = this driver: * * HPA4070A known as "HCRX", a 1280x1024 color device with 8 planes @@ -30,7 +30,7 @@ * supports 1280x1024 color displays with 8 planes. * HP710G same as HP710C, 1280x1024 grayscale only * HP710L same as HP710C, 1024x768 color only - * HP712 internal graphics support on HP9000s712 SPU, supports 640x480,=20 + * HP712 internal graphics support on HP9000s712 SPU, supports 640x480, * 1024x768 or 1280x1024 color displays on 8 planes (Artist) * * This file is subject to the terms and conditions of the GNU General Pub= lic @@ -92,7 +92,7 @@ typedef struct { __s32 misc_video_end; } video_setup_t; =20 -typedef struct { =20 +typedef struct { __s16 sizeof_ngle_data; __s16 x_size_visible; /* visible screen dim in pixels */ __s16 y_size_visible; @@ -177,10 +177,10 @@ static int __initdata stifb_bpp_pref[MAX_STI_ROMS]; #endif /* DEBUG_STIFB_REGS */ =20 =20 -#define ENABLE 1 /* for enabling/disabling screen */=09 +#define ENABLE 1 /* for enabling/disabling screen */ #define DISABLE 0 =20 -#define NGLE_LOCK(fb_info) do { } while (0)=20 +#define NGLE_LOCK(fb_info) do { } while (0) #define NGLE_UNLOCK(fb_info) do { } while (0) =20 static void @@ -198,9 +198,9 @@ SETUP_HW(struct stifb_info *fb) =20 static void SETUP_FB(struct stifb_info *fb) -{=09 +{ unsigned int reg10_value =3D 0; -=09 + SETUP_HW(fb); switch (fb->id) { @@ -210,15 +210,15 @@ SETUP_FB(struct stifb_info *fb) reg10_value =3D 0x13601000; break; case S9000_ID_A1439A: - if (fb->info.var.bits_per_pixel =3D=3D 32) =09 + if (fb->info.var.bits_per_pixel =3D=3D 32) reg10_value =3D 0xBBA0A000; - else=20 + else reg10_value =3D 0x13601000; break; case S9000_ID_HCRX: if (fb->info.var.bits_per_pixel =3D=3D 32) reg10_value =3D 0xBBA0A000; - else =09 + else reg10_value =3D 0x13602000; break; case S9000_ID_TIMBER: @@ -243,7 +243,7 @@ START_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb) } =20 static void -WRITE_IMAGE_COLOR(struct stifb_info *fb, int index, int color)=20 +WRITE_IMAGE_COLOR(struct stifb_info *fb, int index, int color) { SETUP_HW(fb); WRITE_WORD(((0x100+index)<<2), fb, REG_3); @@ -251,30 +251,30 @@ WRITE_IMAGE_COLOR(struct stifb_info *fb, int index, i= nt color) } =20 static void -FINISH_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb)=20 -{ =09 +FINISH_IMAGE_COLORMAP_ACCESS(struct stifb_info *fb) +{ WRITE_WORD(0x400, fb, REG_2); if (fb->info.var.bits_per_pixel =3D=3D 32) { WRITE_WORD(0x83000100, fb, REG_1); } else { if (fb->id =3D=3D S9000_ID_ARTIST || fb->id =3D=3D CRT_ID_VISUALIZE_EG) WRITE_WORD(0x80000100, fb, REG_26); - else =09 + else WRITE_WORD(0x80000100, fb, REG_1); } SETUP_FB(fb); } =20 static void -SETUP_RAMDAC(struct stifb_info *fb)=20 +SETUP_RAMDAC(struct stifb_info *fb) { SETUP_HW(fb); WRITE_WORD(0x04000000, fb, 0x1020); WRITE_WORD(0xff000000, fb, 0x1028); } =20 -static void=20 -CRX24_SETUP_RAMDAC(struct stifb_info *fb)=20 +static void +CRX24_SETUP_RAMDAC(struct stifb_info *fb) { SETUP_HW(fb); WRITE_WORD(0x04000000, fb, 0x1000); @@ -286,14 +286,14 @@ CRX24_SETUP_RAMDAC(struct stifb_info *fb) } =20 #if 0 -static void=20 +static void HCRX_SETUP_RAMDAC(struct stifb_info *fb) { WRITE_WORD(0xffffffff, fb, REG_32); } #endif =20 -static void=20 +static void CRX24_SET_OVLY_MASK(struct stifb_info *fb) { SETUP_HW(fb); @@ -314,7 +314,7 @@ ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enabl= e) WRITE_WORD(value, fb, 0x1038); } =20 -static void=20 +static void CRX24_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable) { unsigned int value =3D enable ? 0x10000000 : 0x30000000; @@ -325,11 +325,11 @@ CRX24_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, i= nt enable) } =20 static void -ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable)=20 +ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, int enable) { u32 DregsMiscVideo =3D REG_21; u32 DregsMiscCtl =3D REG_27; -=09 + SETUP_HW(fb); if (enable) { WRITE_WORD(READ_WORD(fb, DregsMiscVideo) | 0x0A000000, fb, DregsMiscVid= eo); @@ -344,7 +344,7 @@ ARTIST_ENABLE_DISABLE_DISPLAY(struct stifb_info *fb, in= t enable) (READ_BYTE(fb, REG_16b3) - 1) =20 #define HYPER_CONFIG_PLANES_24 0x00000100 -=09 + #define IS_24_DEVICE(fb) \ (fb->deviceSpecificConfig & HYPER_CONFIG_PLANES_24) =20 @@ -470,15 +470,15 @@ SETUP_ATTR_ACCESS(struct stifb_info *fb, unsigned Buf= ferNumber) } =20 static void -SET_ATTR_SIZE(struct stifb_info *fb, int width, int height)=20 +SET_ATTR_SIZE(struct stifb_info *fb, int width, int height) { - /* REG_6 seems to have special values when run on a=20 + /* REG_6 seems to have special values when run on a RDI precisionbook parisc laptop (INTERNAL_EG_DX1024 or INTERNAL_EG_X1024). The values are: 0x2f0: internal (LCD) & external display enabled 0x2a0: external display only 0x000: zero on standard artist graphic cards - */=20 + */ WRITE_WORD(0x00000000, fb, REG_6); WRITE_WORD((width<<16) | height, fb, REG_9); WRITE_WORD(0x05000000, fb, REG_6); @@ -486,7 +486,7 @@ SET_ATTR_SIZE(struct stifb_info *fb, int width, int hei= ght) } =20 static void -FINISH_ATTR_ACCESS(struct stifb_info *fb)=20 +FINISH_ATTR_ACCESS(struct stifb_info *fb) { SETUP_HW(fb); WRITE_WORD(0x00000000, fb, REG_12); @@ -499,7 +499,7 @@ elkSetupPlanes(struct stifb_info *fb) SETUP_FB(fb); } =20 -static void=20 +static void ngleSetupAttrPlanes(struct stifb_info *fb, int BufferNumber) { SETUP_ATTR_ACCESS(fb, BufferNumber); @@ -519,7 +519,7 @@ rattlerSetupPlanes(struct stifb_info *fb) * read mask register for overlay planes, not image planes). */ CRX24_SETUP_RAMDAC(fb); - =20 + /* change fb->id temporarily to fool SETUP_FB() */ saved_id =3D fb->id; fb->id =3D CRX24_OVERLAY_PLANES; @@ -565,7 +565,7 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithi= nLut, int length) lutBltCtl.all =3D 0x80000000; lutBltCtl.fields.length =3D length; =20 - switch (fb->id)=20 + switch (fb->id) { case S9000_ID_A1439A: /* CRX24 */ if (fb->var.bits_per_pixel =3D=3D 8) { @@ -576,12 +576,12 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWit= hinLut, int length) lutBltCtl.fields.lutOffset =3D 0 * 256; } break; - =09 + case S9000_ID_ARTIST: lutBltCtl.fields.lutType =3D NGLE_CMAP_INDEXED0_TYPE; lutBltCtl.fields.lutOffset =3D 0 * 256; break; - =09 + default: lutBltCtl.fields.lutType =3D NGLE_CMAP_INDEXED0_TYPE; lutBltCtl.fields.lutOffset =3D 0; @@ -596,7 +596,7 @@ setNgleLutBltCtl(struct stifb_info *fb, int offsetWithi= nLut, int length) #endif =20 static NgleLutBltCtl -setHyperLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length)=20 +setHyperLutBltCtl(struct stifb_info *fb, int offsetWithinLut, int length) { NgleLutBltCtl lutBltCtl; =20 @@ -633,7 +633,7 @@ static void hyperUndoITE(struct stifb_info *fb) =20 /* Hardware setup for full-depth write to "magic" location */ GET_FIFO_SLOTS(fb, nFreeFifoSlots, 7); - NGLE_QUICK_SET_DST_BM_ACCESS(fb,=20 + NGLE_QUICK_SET_DST_BM_ACCESS(fb, BA(IndexedDcd, Otc04, Ots08, AddrLong, BAJustPoint(0), BINovly, BAIndexBase(0))); NGLE_QUICK_SET_IMAGE_BITMAP_OP(fb, @@ -653,13 +653,13 @@ static void hyperUndoITE(struct stifb_info *fb) NGLE_UNLOCK(fb); } =20 -static void=20 +static void ngleDepth8_ClearImagePlanes(struct stifb_info *fb) { /* FIXME! */ } =20 -static void=20 +static void ngleDepth24_ClearImagePlanes(struct stifb_info *fb) { /* FIXME! */ @@ -675,7 +675,7 @@ ngleResetAttrPlanes(struct stifb_info *fb, unsigned int= ctlPlaneReg) NGLE_LOCK(fb); =20 GET_FIFO_SLOTS(fb, nFreeFifoSlots, 4); - NGLE_QUICK_SET_DST_BM_ACCESS(fb,=20 + NGLE_QUICK_SET_DST_BM_ACCESS(fb, BA(IndexedDcd, Otc32, OtsIndirect, AddrLong, BAJustPoint(0), BINattr, BAIndexBase(0))); @@ -713,22 +713,22 @@ ngleResetAttrPlanes(struct stifb_info *fb, unsigned i= nt ctlPlaneReg) /**** Finally, set the Control Plane Register back to zero: ****/ GET_FIFO_SLOTS(fb, nFreeFifoSlots, 1); NGLE_QUICK_SET_CTL_PLN_REG(fb, 0); -=09 + NGLE_UNLOCK(fb); } - =20 + static void ngleClearOverlayPlanes(struct stifb_info *fb, int mask, int data) { int nFreeFifoSlots =3D 0; u32 packed_dst; u32 packed_len; - =20 + NGLE_LOCK(fb); =20 /* Hardware setup */ GET_FIFO_SLOTS(fb, nFreeFifoSlots, 8); - NGLE_QUICK_SET_DST_BM_ACCESS(fb,=20 + NGLE_QUICK_SET_DST_BM_ACCESS(fb, BA(IndexedDcd, Otc04, Ots08, AddrLong, BAJustPoint(0), BINovly, BAIndexBase(0))); =20 @@ -736,23 +736,23 @@ ngleClearOverlayPlanes(struct stifb_info *fb, int mas= k, int data) =20 NGLE_REALLY_SET_IMAGE_FG_COLOR(fb, data); NGLE_REALLY_SET_IMAGE_PLANEMASK(fb, mask); - =20 + packed_dst =3D 0; packed_len =3D (fb->info.var.xres << 16) | fb->info.var.yres; NGLE_SET_DSTXY(fb, packed_dst); - =20 - /* Write zeroes to overlay planes */ =20 + + /* Write zeroes to overlay planes */ NGLE_QUICK_SET_IMAGE_BITMAP_OP(fb, IBOvals(RopSrc, MaskAddrOffset(0), BitmapExtent08, StaticReg(0), DataDynamic, MaskOtc, BGx(0), FGx(0))); - =20 + SET_LENXY_START_RECFILL(fb, packed_len); =20 NGLE_UNLOCK(fb); } =20 -static void=20 +static void hyperResetPlanes(struct stifb_info *fb, int enable) { unsigned int controlPlaneReg; @@ -783,7 +783,7 @@ hyperResetPlanes(struct stifb_info *fb, int enable) ngleClearOverlayPlanes(fb, 0xff, 255); =20 /************************************************** - ** Also need to counteract ITE settings=20 + ** Also need to counteract ITE settings **************************************************/ hyperUndoITE(fb); break; @@ -803,13 +803,13 @@ hyperResetPlanes(struct stifb_info *fb, int enable) ngleResetAttrPlanes(fb, controlPlaneReg); break; } -=09 + NGLE_UNLOCK(fb); } =20 /* Return pointer to in-memory structure holding ELK device-dependent ROM = values. */ =20 -static void=20 +static void ngleGetDeviceRomData(struct stifb_info *fb) { #if 0 @@ -821,7 +821,7 @@ XXX: FIXME: !!! char *pCard8; int i; char *mapOrigin =3D NULL; - =20 + int romTableIdx; =20 pPackedDevRomData =3D fb->ngle_rom; @@ -888,7 +888,7 @@ SETUP_HCRX(struct stifb_info *fb) =20 /* Initialize Hyperbowl registers */ GET_FIFO_SLOTS(fb, nFreeFifoSlots, 7); -=09 + if (IS_24_DEVICE(fb)) { hyperbowl =3D (fb->info.var.bits_per_pixel =3D=3D 32) ? HYPERBOWL_MODE01_8_24_LUT0_TRANSPARENT_LUT1_OPAQUE : @@ -897,9 +897,9 @@ SETUP_HCRX(struct stifb_info *fb) /* First write to Hyperbowl must happen twice (bug) */ WRITE_WORD(hyperbowl, fb, REG_40); WRITE_WORD(hyperbowl, fb, REG_40); - =09 + WRITE_WORD(HYPERBOWL_MODE2_8_24, fb, REG_39); - =09 + WRITE_WORD(0x014c0148, fb, REG_42); /* Set lut 0 to be the direct color = */ WRITE_WORD(0x404c4048, fb, REG_43); WRITE_WORD(0x034c0348, fb, REG_44); @@ -968,7 +968,7 @@ stifb_setcolreg(u_int regno, u_int red, u_int green, 0, /* Offset w/i LUT */ 256); /* Load entire LUT */ NGLE_BINC_SET_SRCADDR(fb, - NGLE_LONG_FB_ADDRESS(0, 0x100, 0));=20 + NGLE_LONG_FB_ADDRESS(0, 0x100, 0)); /* 0x100 is same as used in WRITE_IMAGE_COLOR() */ START_COLORMAPLOAD(fb, lutBltCtl.all); SETUP_FB(fb); @@ -1006,7 +1006,7 @@ stifb_blank(int blank_mode, struct fb_info *info) ENABLE_DISABLE_DISPLAY(fb, enable); break; } -=09 + SETUP_FB(fb); return 0; } @@ -1092,15 +1092,15 @@ stifb_init_display(struct stifb_info *fb) =20 /* HCRX specific initialization */ SETUP_HCRX(fb); -=09 + /* if (id =3D=3D S9000_ID_HCRX) hyperInitSprite(fb); else ngleInitSprite(fb); */ -=09 - /* Initialize the image planes. */=20 + + /* Initialize the image planes. */ switch (id) { case S9000_ID_HCRX: hyperResetPlanes(fb, ENABLE); @@ -1170,7 +1170,7 @@ static int __init stifb_init_fb(struct sti_struct *st= i, int bpp_pref) fb =3D kzalloc(sizeof(*fb), GFP_ATOMIC); if (!fb) return -ENOMEM; -=09 + info =3D &fb->info; =20 /* set struct to a known state */ @@ -1211,7 +1211,7 @@ static int __init stifb_init_fb(struct sti_struct *st= i, int bpp_pref) dev_name, fb->id); goto out_err0; } -=09 + /* default to 8 bpp on most graphic chips */ bpp =3D 8; xres =3D sti_onscreen_x(fb->sti); @@ -1232,7 +1232,7 @@ static int __init stifb_init_fb(struct sti_struct *st= i, int bpp_pref) fb->id =3D S9000_ID_A1659A; break; case S9000_ID_TIMBER: /* HP9000/710 Any (may be a grayscale device) */ - if (strstr(dev_name, "GRAYSCALE") ||=20 + if (strstr(dev_name, "GRAYSCALE") || strstr(dev_name, "Grayscale") || strstr(dev_name, "grayscale")) var->grayscale =3D 1; @@ -1271,16 +1271,16 @@ static int __init stifb_init_fb(struct sti_struct *= sti, int bpp_pref) case CRT_ID_VISUALIZE_EG: case S9000_ID_ARTIST: /* Artist */ break; - default:=20 + default: #ifdef FALLBACK_TO_1BPP - printk(KERN_WARNING=20 + printk(KERN_WARNING "stifb: Unsupported graphics card (id=3D0x%08x) " "- now trying 1bpp mode instead\n", fb->id); bpp =3D 1; /* default to 1 bpp */ break; #else - printk(KERN_WARNING=20 + printk(KERN_WARNING "stifb: Unsupported graphics card (id=3D0x%08x) " "- skipping.\n", fb->id); @@ -1296,11 +1296,11 @@ static int __init stifb_init_fb(struct sti_struct *= sti, int bpp_pref) fix->line_length =3D (fb->sti->glob_cfg->total_x * bpp) / 8; if (!fix->line_length) fix->line_length =3D 2048; /* default */ -=09 + /* limit fbsize to max visible screen size */ if (fix->smem_len > yres*fix->line_length) fix->smem_len =3D ALIGN(yres*fix->line_length, 4*1024*1024); -=09 + fix->accel =3D FB_ACCEL_NONE; =20 switch (bpp) { @@ -1326,7 +1326,7 @@ static int __init stifb_init_fb(struct sti_struct *st= i, int bpp_pref) default: break; } -=09 + var->xres =3D var->xres_virtual =3D xres; var->yres =3D var->yres_virtual =3D yres; var->bits_per_pixel =3D bpp; @@ -1352,7 +1352,7 @@ static int __init stifb_init_fb(struct sti_struct *st= i, int bpp_pref) fix->smem_start, fix->smem_start+fix->smem_len); goto out_err2; } - =09 + if (!request_mem_region(fix->mmio_start, fix->mmio_len, "stifb mmio")) { printk(KERN_ERR "stifb: cannot reserve sti mmio region 0x%04lx-0x%04lx\n= ", fix->mmio_start, fix->mmio_start+fix->mmio_len); @@ -1366,11 +1366,11 @@ static int __init stifb_init_fb(struct sti_struct *= sti, int bpp_pref) =20 fb_info(&fb->info, "%s %dx%d-%d frame buffer device, %s, id: %04x, mmio: = 0x%04lx\n", fix->id, - var->xres,=20 + var->xres, var->yres, var->bits_per_pixel, dev_name, - fb->id,=20 + fb->id, fix->mmio_start); =20 return 0; @@ -1399,7 +1399,7 @@ static int __init stifb_init(void) struct sti_struct *sti; struct sti_struct *def_sti; int i; -=09 + #ifndef MODULE char *option =3D NULL; =20 @@ -1411,7 +1411,7 @@ static int __init stifb_init(void) printk(KERN_INFO "stifb: disabled by \"stifb=3Doff\" kernel parameter\n"= ); return -ENXIO; } -=09 + def_sti =3D sti_get_rom(0); if (def_sti) { for (i =3D 1; i <=3D MAX_STI_ROMS; i++) { @@ -1445,7 +1445,7 @@ stifb_cleanup(void) { struct sti_struct *sti; int i; -=09 + for (i =3D 1; i <=3D MAX_STI_ROMS; i++) { sti =3D sti_get_rom(i); if (!sti) @@ -1468,10 +1468,10 @@ int __init stifb_setup(char *options) { int i; -=09 + if (!options || !*options) return 1; -=09 + if (strncmp(options, "off", 3) =3D=3D 0) { stifb_disabled =3D 1; options +=3D 3; --=20 2.39.2