From d66736b0c0d3b2b4462f281b35a9b1cdf3dbe7b8 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 21 Aug 2024 11:24:12 +0000 Subject: [PATCH] remove unused vars and structs --- sys/dev/fdt/rkdrm.c | 8 +------- sys/dev/fdt/rkdrm.h | 18 +----------------- sys/dev/fdt/rkdwhdmi.c | 4 +--- sys/dev/fdt/rkvop.c | 9 +-------- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/sys/dev/fdt/rkdrm.c b/sys/dev/fdt/rkdrm.c index c3f189da6cd..8e2b7962640 100644 --- a/sys/dev/fdt/rkdrm.c +++ b/sys/dev/fdt/rkdrm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkdrm.c,v 1.22 2024/05/13 01:15:50 jsg Exp $ */ +/* $OpenBSD: rkdrm.c,v 1.23 2024/08/21 11:24:12 jsg Exp $ */ /* $NetBSD: rk_drm.c,v 1.3 2019/12/15 01:00:58 mrg Exp $ */ /*- * Copyright (c) 2019 Jared D. McNeill @@ -245,7 +245,6 @@ int rkdrm_wsioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p) { struct rasops_info *ri = v; - struct rkdrm_softc *sc = ri->ri_hw; struct wsdisplay_param *dp = (struct wsdisplay_param *)data; struct wsdisplay_fbinfo *wdf; @@ -368,7 +367,6 @@ rkdrm_attachhook(struct device *dev) struct drm_fb_helper *helper = &sc->helper; struct rasops_info *ri = &sc->ro; struct rkdrm_framebuffer *sfb; - struct drm_device *ddev; uint32_t *ports; int i, portslen, nports; int console = 0; @@ -478,14 +476,10 @@ rkdrm_attachhook(struct device *dev) int rkdrm_fb_probe(struct drm_fb_helper *helper, struct drm_fb_helper_surface_size *sizes) { - struct rkdrm_softc *sc = rkdrm_private(helper->dev); struct drm_device *ddev = helper->dev; struct rkdrm_framebuffer *sfb = to_rkdrm_framebuffer(helper->fb); struct drm_mode_fb_cmd2 mode_cmd = { 0 }; struct drm_framebuffer *fb = helper->fb; - struct wsemuldisplaydev_attach_args aa; - struct rasops_info *ri = &sc->ro; - struct rkdrmfb_attach_args sfa; unsigned int bytes_per_pixel; struct fb_info *info; size_t size; diff --git a/sys/dev/fdt/rkdrm.h b/sys/dev/fdt/rkdrm.h index b7aed7b37da..f0a47054411 100644 --- a/sys/dev/fdt/rkdrm.h +++ b/sys/dev/fdt/rkdrm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rkdrm.h,v 1.4 2023/09/11 04:51:24 jsg Exp $ */ +/* $OpenBSD: rkdrm.h,v 1.5 2024/08/21 11:24:12 jsg Exp $ */ /* $NetBSD: rk_drm.h,v 1.1 2019/11/09 23:30:14 jmcneill Exp $ */ /*- * Copyright (c) 2019 Jared D. McNeill @@ -48,8 +48,6 @@ #define DRIVER_MINOR 0 #define DRIVER_PATCHLEVEL 0 -struct rk_framebuffer; - #define RK_DRM_MAX_CRTC 2 struct rkdrm_vblank { @@ -86,20 +84,6 @@ struct rkdrm_framebuffer { struct drm_gem_dma_object *obj; }; -struct rkdrm_fbdev { - struct drm_fb_helper helper; -}; - -struct rkdrmfb_attach_args { - struct drm_device *sfa_drm_dev; - struct drm_fb_helper *sfa_fb_helper; - struct drm_fb_helper_surface_size sfa_fb_sizes; - bus_space_tag_t sfa_fb_iot; - bus_dma_tag_t sfa_fb_dmat; - uint32_t sfa_fb_linebytes; -}; - -#define rkdrm_private(ddev) (ddev)->dev_private #define to_rkdrm_framebuffer(x) container_of(x, struct rkdrm_framebuffer, base) #endif /* _ARM_RK_DRM_H */ diff --git a/sys/dev/fdt/rkdwhdmi.c b/sys/dev/fdt/rkdwhdmi.c index 037284f79ce..acde080db68 100644 --- a/sys/dev/fdt/rkdwhdmi.c +++ b/sys/dev/fdt/rkdwhdmi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkdwhdmi.c,v 1.7 2024/01/16 23:37:50 jsg Exp $ */ +/* $OpenBSD: rkdwhdmi.c,v 1.8 2024/08/21 11:24:12 jsg Exp $ */ /* $NetBSD: rk_dwhdmi.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $ */ /*- @@ -123,8 +123,6 @@ rkdwhdmi_attach(struct device *parent, struct device *self, void *aux) struct rkdwhdmi_softc *sc = (struct rkdwhdmi_softc *)self; struct fdt_attach_args *faa = aux; uint32_t grf; - bus_addr_t addr; - bus_size_t size; uint32_t phandle; if (faa->fa_nreg < 1) { diff --git a/sys/dev/fdt/rkvop.c b/sys/dev/fdt/rkvop.c index e06ebe002df..471c544438e 100644 --- a/sys/dev/fdt/rkvop.c +++ b/sys/dev/fdt/rkvop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rkvop.c,v 1.7 2023/01/01 01:34:33 jsg Exp $ */ +/* $OpenBSD: rkvop.c,v 1.8 2024/08/21 11:24:12 jsg Exp $ */ /* $NetBSD: rk_vop.c,v 1.6 2020/01/05 12:14:35 mrg Exp $ */ /*- * Copyright (c) 2019 Jared D. McNeill @@ -207,7 +207,6 @@ rkvop_attach(struct device *parent, struct device *self, void *aux) { struct rkvop_softc *sc = (struct rkvop_softc *)self; struct fdt_attach_args *faa = aux; - int i, port, ep, nep; paddr_t paddr; if (faa->fa_nreg < 1) @@ -279,8 +278,6 @@ rkvop_plane_check(struct drm_plane *plane, struct drm_atomic_state *das) void rkvop_plane_update(struct drm_plane *plane, struct drm_atomic_state *das) { - struct drm_plane_state *old_state = drm_atomic_get_new_plane_state(das, - plane); struct drm_plane_state *state = plane->state; struct drm_crtc *crtc = state->crtc; struct rkvop_crtc *rkcrtc = to_rkvop_crtc(crtc); @@ -401,8 +398,6 @@ rkvop_crtc_check(struct drm_crtc *crtc, struct drm_atomic_state *das) void rkvop_crtc_enable(struct drm_crtc *crtc, struct drm_atomic_state *das) { - struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(das, - crtc); struct rkvop_crtc *rkcrtc = to_rkvop_crtc(crtc); struct rkvop_softc *sc = rkcrtc->sc; struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode; @@ -496,8 +491,6 @@ rkvop_crtc_enable(struct drm_crtc *crtc, struct drm_atomic_state *das) void rkvop_crtc_flush(struct drm_crtc *crtc, struct drm_atomic_state *das) { - struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(das, - crtc); struct rkvop_crtc *rkcrtc = to_rkvop_crtc(crtc); struct rkvop_softc *sc = rkcrtc->sc; -- 2.20.1