SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-06-19 19:56:02 +00:00
parent 99745de747
commit efaa6fdefb
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
23 changed files with 168 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sys/dev/ata/ata_wdc.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: ata_wdc.c,v 1.53 2024/05/26 10:01:01 jsg Exp $ */
/* $OpenBSD: ata_wdc.c,v 1.54 2024/06/18 09:08:02 jsg Exp $ */
/* $NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $ */
/*
@ -808,23 +808,3 @@ wdc_ata_err(struct ata_drive_datas *drvp, struct ata_bio *ata_bio)
ata_bio->flags |= ATA_CORR;
return WDC_ATA_NOERR;
}
#if 0
int
wdc_ata_addref(drvp)
struct ata_drive_datas *drvp;
{
struct channel_softc *chp = drvp->chnl_softc;
return (wdc_addref(chp));
}
void
wdc_ata_delref(drvp)
struct ata_drive_datas *drvp;
{
struct channel_softc *chp = drvp->chnl_softc;
wdc_delref(chp);
}
#endif

5
sys/dev/ic/wdcvar.h
View file

@ -1,4 +1,4 @@
/* $OpenBSD: wdcvar.h,v 1.58 2024/05/29 00:48:15 jsg Exp $ */
/* $OpenBSD: wdcvar.h,v 1.59 2024/06/18 12:37:29 jsg Exp $ */
/* $NetBSD: wdcvar.h,v 1.17 1999/04/11 20:50:29 bouyer Exp $ */
/*-
@ -287,9 +287,6 @@ void wdccommandshort(struct channel_softc *, int, int);
void wdctimeout(void *arg);
void wdc_do_reset(struct channel_softc *);
int wdc_addref(struct channel_softc *);
void wdc_delref(struct channel_softc *);
/*
* ST506 spec says that if READY or SEEKCMPLT go off, then the read or write
* command is aborted.

2
sys/dev/pci/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
View file

@ -2044,7 +2044,7 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
static void smu_v13_0_6_restore_pci_config(struct smu_context *smu)
{
STUB();
#if notyet
#ifdef notyet
struct amdgpu_device *adev = smu->adev;
int i;