From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0152C072B5 for ; Fri, 24 May 2019 08:55:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6662C217F9 for ; Fri, 24 May 2019 08:55:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="A84J3j6y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390009AbfEXIyX (ORCPT ); Fri, 24 May 2019 04:54:23 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:39270 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389963AbfEXIyS (ORCPT ); Fri, 24 May 2019 04:54:18 -0400 Received: by mail-ed1-f67.google.com with SMTP id e24so13342348edq.6 for ; Fri, 24 May 2019 01:54:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z5iZhjuR5FCK/3TxL7IjS7BEtXamfSAXEK7faRMJIyY=; b=A84J3j6yA9uBLJ4ynLq1hkbX6gaeWiJBlrLbMqTJZ8UL/PCTKWUctpHKWgggmpBGPf I8KeLGCgt5cQA9HVi3LQAUwxnb1KiMFfk+3rbZjqd6yF4kX0nRL+Crqvs1W6zyDbd5LA yXVpa3vQNEoL/t8Djh76UgtdUToi4TPriNRZ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z5iZhjuR5FCK/3TxL7IjS7BEtXamfSAXEK7faRMJIyY=; b=RIBkWa5k5/xbPD26hK54L06Jx40sxbD1mdUqqDubJAXKB7BUgcx8u0o1ZR06dVvMgk PfURuYwy2yjgzSnY+tDIAdGz3xLqObYkv2JTWspgCk77jKcB5muuea3Qlr0fOsmIJsxb eL9KotkaYPCGwZU3GZrWkhFiBPwhq+M3Zqb9YvhUmG8wMkIFjc6XKJuUqC+bMXlJrNHi TleUmih8bUOwW336TGnlwSiLKz6Ub0/93AxOypVCUwxgHzQLrEZu14VX85j0Tn4kP3CB SaqOsS5S5EeFd301vu/VDVz4942/Zj6k6ABVlh53oMyi5QfsR3jd9Msicg3VOKZWnTxz Vi5w== X-Gm-Message-State: APjAAAXyXaoKUf2duT1JzJEJ7F3M39ap2e1UVzbAMaLrCfRKP/IOSwkT 3aNxBMKRPMTWlQUxIxhYQ0HyeBelmuo= X-Google-Smtp-Source: APXvYqw+C7uEvcSOzAqBpZKzIjQB+kCYivog+9nN4dN0rkn4Uvf91qd6a0Cft/NG3LdotqRz3PN/jA== X-Received: by 2002:a17:906:1c4a:: with SMTP id l10mr14985452ejg.124.1558688056848; Fri, 24 May 2019 01:54:16 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id 96sm567082edq.68.2019.05.24.01.54.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 01:54:16 -0700 (PDT) From: Daniel Vetter To: LKML Cc: Intel Graphics Development , DRI Development , Daniel Vetter , Geert Uytterhoeven Subject: [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Date: Fri, 24 May 2019 10:53:32 +0200 Message-Id: <20190524085354.27411-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's dead code, and removing it avoids me having to understand what it's doing with lock_fb_info. Signed-off-by: Daniel Vetter Reviewed-by: Geert Uytterhoeven Cc: Geert Uytterhoeven Cc: Daniel Vetter --- drivers/video/fbdev/sh_mobile_lcdcfb.c | 63 -------------------------- drivers/video/fbdev/sh_mobile_lcdcfb.h | 5 -- 2 files changed, 68 deletions(-) diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c index dc46be38c970..c5924f5e98c6 100644 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c @@ -556,67 +556,6 @@ sh_mobile_lcdc_must_reconfigure(struct sh_mobile_lcdc_chan *ch, static int sh_mobile_lcdc_check_var(struct fb_var_screeninfo *var, struct fb_info *info); -static int sh_mobile_lcdc_display_notify(struct sh_mobile_lcdc_chan *ch, - enum sh_mobile_lcdc_entity_event event, - const struct fb_videomode *mode, - const struct fb_monspecs *monspec) -{ - struct fb_info *info = ch->info; - struct fb_var_screeninfo var; - int ret = 0; - - switch (event) { - case SH_MOBILE_LCDC_EVENT_DISPLAY_CONNECT: - /* HDMI plug in */ - console_lock(); - if (lock_fb_info(info)) { - - - ch->display.width = monspec->max_x * 10; - ch->display.height = monspec->max_y * 10; - - if (!sh_mobile_lcdc_must_reconfigure(ch, mode) && - info->state == FBINFO_STATE_RUNNING) { - /* First activation with the default monitor. - * Just turn on, if we run a resume here, the - * logo disappears. - */ - info->var.width = ch->display.width; - info->var.height = ch->display.height; - sh_mobile_lcdc_display_on(ch); - } else { - /* New monitor or have to wake up */ - fb_set_suspend(info, 0); - } - - - unlock_fb_info(info); - } - console_unlock(); - break; - - case SH_MOBILE_LCDC_EVENT_DISPLAY_DISCONNECT: - /* HDMI disconnect */ - console_lock(); - if (lock_fb_info(info)) { - fb_set_suspend(info, 1); - unlock_fb_info(info); - } - console_unlock(); - break; - - case SH_MOBILE_LCDC_EVENT_DISPLAY_MODE: - /* Validate a proposed new mode */ - fb_videomode_to_var(&var, mode); - var.bits_per_pixel = info->var.bits_per_pixel; - var.grayscale = info->var.grayscale; - ret = sh_mobile_lcdc_check_var(&var, info); - break; - } - - return ret; -} - /* ----------------------------------------------------------------------------- * Format helpers */ @@ -2540,8 +2479,6 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch) unsigned int max_size; unsigned int i; - ch->notify = sh_mobile_lcdc_display_notify; - /* Validate the format. */ format = sh_mobile_format_info(cfg->fourcc); if (format == NULL) { diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.h b/drivers/video/fbdev/sh_mobile_lcdcfb.h index b8e47a8bd8ab..589400372098 100644 --- a/drivers/video/fbdev/sh_mobile_lcdcfb.h +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.h @@ -87,11 +87,6 @@ struct sh_mobile_lcdc_chan { unsigned long base_addr_c; unsigned int line_size; - int (*notify)(struct sh_mobile_lcdc_chan *ch, - enum sh_mobile_lcdc_entity_event event, - const struct fb_videomode *mode, - const struct fb_monspecs *monspec); - /* Backlight */ struct backlight_device *bl; unsigned int bl_brightness; -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Date: Fri, 24 May 2019 10:53:32 +0200 Message-ID: <20190524085354.27411-12-daniel.vetter@ffwll.ch> References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id 565CC6E0AE for ; Fri, 24 May 2019 08:54:18 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id b8so13302949edm.11 for ; Fri, 24 May 2019 01:54:18 -0700 (PDT) In-Reply-To: <20190524085354.27411-1-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: LKML Cc: Daniel Vetter , Intel Graphics Development , Geert Uytterhoeven , DRI Development List-Id: dri-devel@lists.freedesktop.org SXQncyBkZWFkIGNvZGUsIGFuZCByZW1vdmluZyBpdCBhdm9pZHMgbWUgaGF2aW5nIHRvIHVuZGVy c3RhbmQKd2hhdCBpdCdzIGRvaW5nIHdpdGggbG9ja19mYl9pbmZvLgoKU2lnbmVkLW9mZi1ieTog RGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KUmV2aWV3ZWQtYnk6IEdlZXJ0 IFV5dHRlcmhvZXZlbiA8Z2VlcnQrcmVuZXNhc0BnbGlkZXIuYmU+CkNjOiBHZWVydCBVeXR0ZXJo b2V2ZW4gPGdlZXJ0K3JlbmVzYXNAZ2xpZGVyLmJlPgpDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVs LnZldHRlckBmZndsbC5jaD4KLS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9sY2Rj ZmIuYyB8IDYzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2 L3NoX21vYmlsZV9sY2RjZmIuaCB8ICA1IC0tCiAyIGZpbGVzIGNoYW5nZWQsIDY4IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvc2hfbW9iaWxlX2xjZGNmYi5j IGIvZHJpdmVycy92aWRlby9mYmRldi9zaF9tb2JpbGVfbGNkY2ZiLmMKaW5kZXggZGM0NmJlMzhj OTcwLi5jNTkyNGY1ZTk4YzYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvc2hfbW9i aWxlX2xjZGNmYi5jCisrKyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvc2hfbW9iaWxlX2xjZGNmYi5j CkBAIC01NTYsNjcgKzU1Niw2IEBAIHNoX21vYmlsZV9sY2RjX211c3RfcmVjb25maWd1cmUoc3Ry dWN0IHNoX21vYmlsZV9sY2RjX2NoYW4gKmNoLAogc3RhdGljIGludCBzaF9tb2JpbGVfbGNkY19j aGVja192YXIoc3RydWN0IGZiX3Zhcl9zY3JlZW5pbmZvICp2YXIsCiAJCQkJICAgIHN0cnVjdCBm Yl9pbmZvICppbmZvKTsKIAotc3RhdGljIGludCBzaF9tb2JpbGVfbGNkY19kaXNwbGF5X25vdGlm eShzdHJ1Y3Qgc2hfbW9iaWxlX2xjZGNfY2hhbiAqY2gsCi0JCQkJCSBlbnVtIHNoX21vYmlsZV9s Y2RjX2VudGl0eV9ldmVudCBldmVudCwKLQkJCQkJIGNvbnN0IHN0cnVjdCBmYl92aWRlb21vZGUg Km1vZGUsCi0JCQkJCSBjb25zdCBzdHJ1Y3QgZmJfbW9uc3BlY3MgKm1vbnNwZWMpCi17Ci0Jc3Ry dWN0IGZiX2luZm8gKmluZm8gPSBjaC0+aW5mbzsKLQlzdHJ1Y3QgZmJfdmFyX3NjcmVlbmluZm8g dmFyOwotCWludCByZXQgPSAwOwotCi0Jc3dpdGNoIChldmVudCkgewotCWNhc2UgU0hfTU9CSUxF X0xDRENfRVZFTlRfRElTUExBWV9DT05ORUNUOgotCQkvKiBIRE1JIHBsdWcgaW4gKi8KLQkJY29u c29sZV9sb2NrKCk7Ci0JCWlmIChsb2NrX2ZiX2luZm8oaW5mbykpIHsKLQotCi0JCQljaC0+ZGlz cGxheS53aWR0aCA9IG1vbnNwZWMtPm1heF94ICogMTA7Ci0JCQljaC0+ZGlzcGxheS5oZWlnaHQg PSBtb25zcGVjLT5tYXhfeSAqIDEwOwotCi0JCQlpZiAoIXNoX21vYmlsZV9sY2RjX211c3RfcmVj b25maWd1cmUoY2gsIG1vZGUpICYmCi0JCQkgICAgaW5mby0+c3RhdGUgPT0gRkJJTkZPX1NUQVRF X1JVTk5JTkcpIHsKLQkJCQkvKiBGaXJzdCBhY3RpdmF0aW9uIHdpdGggdGhlIGRlZmF1bHQgbW9u aXRvci4KLQkJCQkgKiBKdXN0IHR1cm4gb24sIGlmIHdlIHJ1biBhIHJlc3VtZSBoZXJlLCB0aGUK LQkJCQkgKiBsb2dvIGRpc2FwcGVhcnMuCi0JCQkJICovCi0JCQkJaW5mby0+dmFyLndpZHRoID0g Y2gtPmRpc3BsYXkud2lkdGg7Ci0JCQkJaW5mby0+dmFyLmhlaWdodCA9IGNoLT5kaXNwbGF5Lmhl aWdodDsKLQkJCQlzaF9tb2JpbGVfbGNkY19kaXNwbGF5X29uKGNoKTsKLQkJCX0gZWxzZSB7Ci0J CQkJLyogTmV3IG1vbml0b3Igb3IgaGF2ZSB0byB3YWtlIHVwICovCi0JCQkJZmJfc2V0X3N1c3Bl bmQoaW5mbywgMCk7Ci0JCQl9Ci0KLQotCQkJdW5sb2NrX2ZiX2luZm8oaW5mbyk7Ci0JCX0KLQkJ Y29uc29sZV91bmxvY2soKTsKLQkJYnJlYWs7Ci0KLQljYXNlIFNIX01PQklMRV9MQ0RDX0VWRU5U X0RJU1BMQVlfRElTQ09OTkVDVDoKLQkJLyogSERNSSBkaXNjb25uZWN0ICovCi0JCWNvbnNvbGVf bG9jaygpOwotCQlpZiAobG9ja19mYl9pbmZvKGluZm8pKSB7Ci0JCQlmYl9zZXRfc3VzcGVuZChp bmZvLCAxKTsKLQkJCXVubG9ja19mYl9pbmZvKGluZm8pOwotCQl9Ci0JCWNvbnNvbGVfdW5sb2Nr KCk7Ci0JCWJyZWFrOwotCi0JY2FzZSBTSF9NT0JJTEVfTENEQ19FVkVOVF9ESVNQTEFZX01PREU6 Ci0JCS8qIFZhbGlkYXRlIGEgcHJvcG9zZWQgbmV3IG1vZGUgKi8KLQkJZmJfdmlkZW9tb2RlX3Rv X3ZhcigmdmFyLCBtb2RlKTsKLQkJdmFyLmJpdHNfcGVyX3BpeGVsID0gaW5mby0+dmFyLmJpdHNf cGVyX3BpeGVsOwotCQl2YXIuZ3JheXNjYWxlID0gaW5mby0+dmFyLmdyYXlzY2FsZTsKLQkJcmV0 ID0gc2hfbW9iaWxlX2xjZGNfY2hlY2tfdmFyKCZ2YXIsIGluZm8pOwotCQlicmVhazsKLQl9Ci0K LQlyZXR1cm4gcmV0OwotfQotCiAvKiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogICogRm9ybWF0IGhl bHBlcnMKICAqLwpAQCAtMjU0MCw4ICsyNDc5LDYgQEAgc2hfbW9iaWxlX2xjZGNfY2hhbm5lbF9p bml0KHN0cnVjdCBzaF9tb2JpbGVfbGNkY19jaGFuICpjaCkKIAl1bnNpZ25lZCBpbnQgbWF4X3Np emU7CiAJdW5zaWduZWQgaW50IGk7CiAKLQljaC0+bm90aWZ5ID0gc2hfbW9iaWxlX2xjZGNfZGlz cGxheV9ub3RpZnk7Ci0KIAkvKiBWYWxpZGF0ZSB0aGUgZm9ybWF0LiAqLwogCWZvcm1hdCA9IHNo X21vYmlsZV9mb3JtYXRfaW5mbyhjZmctPmZvdXJjYyk7CiAJaWYgKGZvcm1hdCA9PSBOVUxMKSB7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9sY2RjZmIuaCBiL2Ry aXZlcnMvdmlkZW8vZmJkZXYvc2hfbW9iaWxlX2xjZGNmYi5oCmluZGV4IGI4ZTQ3YThiZDhhYi4u NTg5NDAwMzcyMDk4IDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9s Y2RjZmIuaAorKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3NoX21vYmlsZV9sY2RjZmIuaApAQCAt ODcsMTEgKzg3LDYgQEAgc3RydWN0IHNoX21vYmlsZV9sY2RjX2NoYW4gewogCXVuc2lnbmVkIGxv bmcgYmFzZV9hZGRyX2M7CiAJdW5zaWduZWQgaW50IGxpbmVfc2l6ZTsKIAotCWludCAoKm5vdGlm eSkoc3RydWN0IHNoX21vYmlsZV9sY2RjX2NoYW4gKmNoLAotCQkgICAgICBlbnVtIHNoX21vYmls ZV9sY2RjX2VudGl0eV9ldmVudCBldmVudCwKLQkJICAgICAgY29uc3Qgc3RydWN0IGZiX3ZpZGVv bW9kZSAqbW9kZSwKLQkJICAgICAgY29uc3Qgc3RydWN0IGZiX21vbnNwZWNzICptb25zcGVjKTsK LQogCS8qIEJhY2tsaWdodCAqLwogCXN0cnVjdCBiYWNrbGlnaHRfZGV2aWNlICpibDsKIAl1bnNp Z25lZCBpbnQgYmxfYnJpZ2h0bmVzczsKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVs