From owner-svn-src-head@freebsd.org Wed Mar 11 15:12:33 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 862D72636BC; Wed, 11 Mar 2020 15:12:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48cwS11hdNz4Y3G; Wed, 11 Mar 2020 15:12:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 06749E771; Wed, 11 Mar 2020 15:12:33 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BFCWre010052; Wed, 11 Mar 2020 15:12:32 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BFCWGR010049; Wed, 11 Mar 2020 15:12:32 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202003111512.02BFCWGR010049@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 11 Mar 2020 15:12:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358890 - in head/sys/cam: . scsi X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys/cam: . scsi X-SVN-Commit-Revision: 358890 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 15:12:33 -0000 Author: imp Date: Wed Mar 11 15:12:31 2020 New Revision: 358890 URL: https://svnweb.freebsd.org/changeset/base/358890 Log: Remove redundantly repetitive static __inline forward function declarations. We typically don't use them elsewhere in the kernel, and they aren't needed here: the actual functions are a few lines away and aren't mutually recursive. Modified: head/sys/cam/cam.h head/sys/cam/cam_sim.h head/sys/cam/cam_xpt.c head/sys/cam/scsi/scsi_all.h Modified: head/sys/cam/cam.h ============================================================================== --- head/sys/cam/cam.h Wed Mar 11 13:51:01 2020 (r358889) +++ head/sys/cam/cam.h Wed Mar 11 15:12:31 2020 (r358890) @@ -403,11 +403,9 @@ void cam_error_print(struct cam_device *device, union __END_DECLS #ifdef _KERNEL -static __inline void cam_init_pinfo(cam_pinfo *pinfo); - static __inline void cam_init_pinfo(cam_pinfo *pinfo) { - pinfo->priority = CAM_PRIORITY_NONE; + pinfo->priority = CAM_PRIORITY_NONE; pinfo->index = CAM_UNQUEUED_INDEX; } #endif Modified: head/sys/cam/cam_sim.h ============================================================================== --- head/sys/cam/cam_sim.h Wed Mar 11 13:51:01 2020 (r358889) +++ head/sys/cam/cam_sim.h Wed Mar 11 15:12:31 2020 (r358890) @@ -79,16 +79,6 @@ void cam_sim_release(struct cam_sim *sim); void cam_sim_set_path(struct cam_sim *sim, u_int32_t path_id); - -/* Convenience routines for accessing sim attributes. */ -static __inline u_int32_t cam_sim_path(const struct cam_sim *sim); -static __inline const char * cam_sim_name(const struct cam_sim *sim); -static __inline void * cam_sim_softc(const struct cam_sim *sim); -static __inline u_int32_t cam_sim_unit(const struct cam_sim *sim); -static __inline u_int32_t cam_sim_bus(const struct cam_sim *sim); - - - /* Generically useful offsets into the sim private area */ #define spriv_ptr0 sim_priv.entries[0].ptr #define spriv_ptr1 sim_priv.entries[1].ptr Modified: head/sys/cam/cam_xpt.c ============================================================================== --- head/sys/cam/cam_xpt.c Wed Mar 11 13:51:01 2020 (r358889) +++ head/sys/cam/cam_xpt.c Wed Mar 11 15:12:31 2020 (r358890) @@ -323,7 +323,6 @@ static xpt_devicefunc_t xptsetasyncfunc; static xpt_busfunc_t xptsetasyncbusfunc; static cam_status xptregister(struct cam_periph *periph, void *arg); -static __inline int device_is_queued(struct cam_ed *device); static __inline int xpt_schedule_devq(struct cam_devq *devq, struct cam_ed *dev) Modified: head/sys/cam/scsi/scsi_all.h ============================================================================== --- head/sys/cam/scsi/scsi_all.h Wed Mar 11 13:51:01 2020 (r358889) +++ head/sys/cam/scsi/scsi_all.h Wed Mar 11 15:12:31 2020 (r358890) @@ -4324,17 +4324,6 @@ int scsi_get_asc(struct scsi_sense_data *sense, u_int int show_errors); int scsi_get_ascq(struct scsi_sense_data *sense, u_int sense_len, int show_errors); -static __inline void scsi_ulto2b(u_int32_t val, u_int8_t *bytes); -static __inline void scsi_ulto3b(u_int32_t val, u_int8_t *bytes); -static __inline void scsi_ulto4b(u_int32_t val, u_int8_t *bytes); -static __inline void scsi_u64to8b(u_int64_t val, u_int8_t *bytes); -static __inline uint32_t scsi_2btoul(const uint8_t *bytes); -static __inline uint32_t scsi_3btoul(const uint8_t *bytes); -static __inline int32_t scsi_3btol(const uint8_t *bytes); -static __inline uint32_t scsi_4btoul(const uint8_t *bytes); -static __inline uint64_t scsi_8btou64(const uint8_t *bytes); -static __inline void *find_mode_page_6(struct scsi_mode_header_6 *mode_header); -static __inline void *find_mode_page_10(struct scsi_mode_header_10 *mode_header); static __inline void scsi_ulto2b(u_int32_t val, u_int8_t *bytes)