From patchwork Wed Dec 20 13:22:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13500116 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9C3CA21352; Wed, 20 Dec 2023 13:46:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="OpN/fXuz"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Hhkt8mNs"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="OpN/fXuz"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="Hhkt8mNs" Received: from imap2.dmz-prg2.suse.org (imap2.dmz-prg2.suse.org [10.150.64.98]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 121DB1F833; Wed, 20 Dec 2023 13:46:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1703080008; 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=2ZHFG9n39YamI3wDgAPvpsSAtHsaelK95dDBu7E/CLY=; b=OpN/fXuzsNCLHbSPfIm/K6pTlJHrpKlh0Jej2hzGMcE+EuC0jNBnYdLT8tOkcda41DUjpP guz2EpRkU6dRt8B7lxeQs6PNp+HUjSf+RHWDDDdov79ISG0soJMO9cNsb05b+F6AptIpcB D6LK6j8j/2r9fYSwynUkdLTrhFJ07nc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1703080008; 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=2ZHFG9n39YamI3wDgAPvpsSAtHsaelK95dDBu7E/CLY=; b=Hhkt8mNsJeDOYIZmEnPliVnGPL+34SFz/vnmUkQr2iFh6eylIgjNBQibrSizLTXEZ2K2WD lGzztGcmZ3zm+WBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1703080008; 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=2ZHFG9n39YamI3wDgAPvpsSAtHsaelK95dDBu7E/CLY=; b=OpN/fXuzsNCLHbSPfIm/K6pTlJHrpKlh0Jej2hzGMcE+EuC0jNBnYdLT8tOkcda41DUjpP guz2EpRkU6dRt8B7lxeQs6PNp+HUjSf+RHWDDDdov79ISG0soJMO9cNsb05b+F6AptIpcB D6LK6j8j/2r9fYSwynUkdLTrhFJ07nc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1703080008; 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=2ZHFG9n39YamI3wDgAPvpsSAtHsaelK95dDBu7E/CLY=; b=Hhkt8mNsJeDOYIZmEnPliVnGPL+34SFz/vnmUkQr2iFh6eylIgjNBQibrSizLTXEZ2K2WD lGzztGcmZ3zm+WBA== Received: from imap2.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap2.dmz-prg2.suse.org (Postfix) with ESMTPS id D54AD13BA9; Wed, 20 Dec 2023 13:46:47 +0000 (UTC) Received: from dovecot-director2.suse.de ([10.150.64.162]) by imap2.dmz-prg2.suse.org with ESMTPSA id mETwMkfwgmWZJwAAn2gu4w (envelope-from ); Wed, 20 Dec 2023 13:46:47 +0000 From: Thomas Zimmermann To: deller@gmx.de, James.Bottomley@HansenPartnership.com, arnd@arndb.de Cc: linux-parisc@vger.kernel.org, linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH 4/4] video/sticore: Remove info field from STI struct Date: Wed, 20 Dec 2023 14:22:57 +0100 Message-ID: <20231220134639.8190-5-tzimmermann@suse.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231220134639.8190-1-tzimmermann@suse.de> References: <20231220134639.8190-1-tzimmermann@suse.de> Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Score: 4.90 X-Spamd-Result: default: False [4.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmx.de]; R_MISSING_CHARSET(2.50)[]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_SEVEN(0.00)[7]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; FREEMAIL_TO(0.00)[gmx.de,HansenPartnership.com,arndb.de]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[15.97%] Authentication-Results: smtp-out2.suse.de; none X-Spam-Level: **** X-Spam-Flag: NO The info field in struct sti_struct was used to detect the default display device. That test is now done with the respective Linux device and the info field is unused. Remove it. Signed-off-by: Thomas Zimmermann --- drivers/video/fbdev/stifb.c | 3 --- include/video/sticore.h | 4 ---- 2 files changed, 7 deletions(-) diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index 36e6bcab83aa..2de0e675fd15 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c @@ -1389,7 +1389,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) } /* save for primary gfx device detection & unregister_framebuffer() */ - sti->info = info; if (register_framebuffer(fb->info) < 0) goto out_err4; @@ -1417,7 +1416,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) iounmap(info->screen_base); out_err0: framebuffer_release(info); - sti->info = NULL; return -ENXIO; } @@ -1496,7 +1494,6 @@ stifb_cleanup(void) framebuffer_release(info); dev_set_drvdata(sti->dev, NULL); } - sti->info = NULL; } } diff --git a/include/video/sticore.h b/include/video/sticore.h index 9d993e22805d..823666af1871 100644 --- a/include/video/sticore.h +++ b/include/video/sticore.h @@ -3,7 +3,6 @@ #define STICORE_H struct device; -struct fb_info; /* generic STI structures & functions */ @@ -368,9 +367,6 @@ struct sti_struct { /* PCI data structures (pg. 17ff from sti.pdf) */ u8 rm_entry[16]; /* pci region mapper array == pci config space offset */ - /* pointer to the fb_info where this STI device is used */ - struct fb_info *info; - /* pointer to the parent device */ struct device *dev;