system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

smartpqi: Fix build issues highlighted by gcc12

Browse source 
Make inline functions defined in a header file as static inline.
Mark inline functions used only in the compilation unit they are
defined in as merely static (the compiler can figure out it these
days).

Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2023-08-25 09:45:28 -06:00
parent e40d16ad6e
commit 2f06449d64
4 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/dev/smartpqi/smartpqi_helper.c
View file

@ -416,18 +416,6 @@ check_device_pending_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_de
}
#endif
extern inline uint64_t
pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device);
extern inline uint64_t
pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device);
extern inline void
pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device);
extern inline uint64_t
pqisrc_read_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device);
void
pqisrc_wait_for_device_commands_to_complete(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device)
{

8
sys/dev/smartpqi/smartpqi_helper.h
View file

@ -28,7 +28,7 @@
#define _PQI_HELPER_H
inline uint64_t
static inline uint64_t
pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device)
{
#if PQISRC_DEVICE_IO_COUNTER
@ -37,7 +37,7 @@ pqisrc_increment_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *dev
#endif
}
inline uint64_t
static inline uint64_t
pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device)
{
#if PQISRC_DEVICE_IO_COUNTER
@ -46,7 +46,7 @@ pqisrc_decrement_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *de
#endif
}
inline void
static inline void
pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device)
{
#if PQISRC_DEVICE_IO_COUNTER
@ -55,7 +55,7 @@ pqisrc_init_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device)
#endif
}
inline uint64_t
static inline uint64_t
pqisrc_read_device_active_io(pqisrc_softstate_t *softs, pqi_scsi_dev_t *device)
{
#if PQISRC_DEVICE_IO_COUNTER

4
sys/dev/smartpqi/smartpqi_prototypes.h
View file

@ -167,10 +167,6 @@ int pqisrc_send_tmf(pqisrc_softstate_t *, pqi_scsi_dev_t *,
rcb_t *, rcb_t *, int);
int pqisrc_write_current_time_to_host_wellness(pqisrc_softstate_t *softs);
int pqisrc_write_driver_version_to_host_wellness(pqisrc_softstate_t *softs);
extern inline void pqisrc_aio_build_cdb(aio_req_locator_t *, uint32_t,
rcb_t *, uint8_t *);
extern inline boolean_t pqisrc_aio_req_too_big(pqisrc_softstate_t *, pqi_scsi_dev_t *,
rcb_t *, aio_req_locator_t *, uint32_t);
void pqisrc_build_aio_common(pqisrc_softstate_t *, pqi_aio_req_t *,
rcb_t *, uint32_t);
void pqisrc_build_aio_R1_write(pqisrc_softstate_t *,

6
sys/dev/smartpqi/smartpqi_request.c
View file

@ -1180,7 +1180,7 @@ fill_lba_for_scsi_rw(pqisrc_softstate_t *softs, uint8_t *cdb, aio_req_locator_t
/* determine whether writes to certain types of RAID are supported. */
inline boolean_t
static boolean_t
pqisrc_is_supported_write(pqisrc_softstate_t *softs,
pqi_scsi_dev_t *device)
{
@ -1492,7 +1492,7 @@ pqisrc_handle_blk_size_diffs(aio_req_locator_t *l)
* handle based on dev type, Raid level, and encryption status.
* TODO: make limits dynamic when this becomes possible.
*/
inline boolean_t
static boolean_t
pqisrc_aio_req_too_big(pqisrc_softstate_t *softs,
pqi_scsi_dev_t *device, rcb_t *rcb,
aio_req_locator_t *l, uint32_t disk_blk_cnt)
@ -1636,7 +1636,7 @@ pqisrc_aio_show_locator_info(pqisrc_softstate_t *softs,
}
/* build the aio cdb */
inline void
static void
pqisrc_aio_build_cdb(aio_req_locator_t *l,
uint32_t disk_blk_cnt, rcb_t *rcb, uint8_t *cdb)
{