From owner-dev-commits-src-branches@freebsd.org Thu Jul 22 17:24:54 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 432606628AE; Thu, 22 Jul 2021 17:24:54 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GVzpt1Txwz4XRh; Thu, 22 Jul 2021 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1B2C615FD9; Thu, 22 Jul 2021 17:24:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16MHOseA005185; Thu, 22 Jul 2021 17:24:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MHOs07005184; Thu, 22 Jul 2021 17:24:54 GMT (envelope-from git) Date: Thu, 22 Jul 2021 17:24:54 GMT Message-Id: <202107221724.16MHOs07005184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 1476f211a5b4 - stable/13 - mmccam: Style(9) more mmc_da.c MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1476f211a5b40900d701c67b756cadc124a0bce2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 17:24:54 -0000 The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=1476f211a5b40900d701c67b756cadc124a0bce2 commit 1476f211a5b40900d701c67b756cadc124a0bce2 Author: Emmanuel Vadot AuthorDate: 2021-06-17 15:54:56 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-22 17:24:34 +0000 mmccam: Style(9) more mmc_da.c No functional changes. Sponsored by: Diablotin Systems (cherry picked from commit 20d601682efe4332dc317a77afada70fa367f89a) --- sys/cam/mmc/mmc_da.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 127d1cb48602..fdaea7b1a768 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -446,12 +446,12 @@ mmc_format_card_id_string(struct sdda_softc *sc, struct mmc_params *mmcp) snprintf(sc->card_sn_string, sizeof(sc->card_sn_string), "%08X", sc->cid.psn); snprintf(sc->card_id_string, sizeof(sc->card_id_string), - "%s%s %s %d.%d SN %08X MFG %02d/%04d by %d %s", - mmcp->card_features & CARD_FEATURE_MMC ? "MMC" : "SD", - mmcp->card_features & CARD_FEATURE_SDHC ? "HC" : "", - sc->cid.pnm, sc->cid.prv >> 4, sc->cid.prv & 0x0f, - sc->cid.psn, sc->cid.mdt_month, sc->cid.mdt_year, - sc->cid.mid, oidstr); + "%s%s %s %d.%d SN %08X MFG %02d/%04d by %d %s", + mmcp->card_features & CARD_FEATURE_MMC ? "MMC" : "SD", + mmcp->card_features & CARD_FEATURE_SDHC ? "HC" : "", + sc->cid.pnm, sc->cid.prv >> 4, sc->cid.prv & 0x0f, + sc->cid.psn, sc->cid.mdt_month, sc->cid.mdt_year, + sc->cid.mid, oidstr); } static int @@ -603,7 +603,7 @@ sddadiskgonecb(struct disk *dp) part = (struct sdda_part *)dp->d_drv1; periph = part->sc->periph; - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("sddadiskgonecb\n")); + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("sddadiskgonecb\n")); cam_periph_release(periph); } @@ -616,7 +616,7 @@ sddaoninvalidate(struct cam_periph *periph) softc = (struct sdda_softc *)periph->softc; - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("sddaoninvalidate\n")); + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("sddaoninvalidate\n")); /* * De-register any async callbacks. @@ -628,15 +628,14 @@ sddaoninvalidate(struct cam_periph *periph) * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("bioq_flush start\n")); + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("bioq_flush start\n")); for (int i = 0; i < MMC_PART_MAX; i++) { if ((part = softc->part[i]) != NULL) { bioq_flush(&part->bio_queue, NULL, ENXIO); disk_gone(part->disk); } } - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("bioq_flush end\n")); - + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("bioq_flush end\n")); } static void @@ -675,7 +674,7 @@ sddaasync(void *callback_arg, u_int32_t code, switch (code) { case AC_FOUND_DEVICE: { - CAM_DEBUG(path, CAM_DEBUG_TRACE, ("=> AC_FOUND_DEVICE\n")); + CAM_DEBUG(path, CAM_DEBUG_TRACE, ("=> AC_FOUND_DEVICE\n")); struct ccb_getdev *cgd; cam_status status; @@ -686,10 +685,10 @@ sddaasync(void *callback_arg, u_int32_t code, if (cgd->protocol != PROTO_MMCSD) break; - if (!(path->device->mmc_ident_data.card_features & CARD_FEATURE_MEMORY)) { - CAM_DEBUG(path, CAM_DEBUG_TRACE, ("No memory on the card!\n")); - break; - } + if (!(path->device->mmc_ident_data.card_features & CARD_FEATURE_MEMORY)) { + CAM_DEBUG(path, CAM_DEBUG_TRACE, ("No memory on the card!\n")); + break; + } /* * Allocate a peripheral instance for @@ -773,7 +772,7 @@ sddaregister(struct cam_periph *periph, void *arg) struct ccb_getdev *cgd; union ccb *request_ccb; /* CCB representing the probe request */ - CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("sddaregister\n")); + CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("sddaregister\n")); cgd = (struct ccb_getdev *)arg; if (cgd == NULL) { printf("sddaregister: no getdev CCB, can't register device\n"); @@ -1257,7 +1256,6 @@ sdda_start_init(void *context, union ccb *start_ccb) } struct sdda_softc *softc = (struct sdda_softc *)periph->softc; - //struct ccb_mmcio *mmcio = &start_ccb->mmcio; struct mmc_params *mmcp = &periph->path->device->mmc_ident_data; struct cam_ed *device = periph->path->device; @@ -1587,7 +1585,6 @@ sdda_add_part(struct cam_periph *periph, u_int type, const char *name, part->disk->d_close = sddaclose; part->disk->d_strategy = sddastrategy; part->disk->d_getattr = sddagetattr; -// sc->disk->d_dump = sddadump; part->disk->d_gone = sddadiskgonecb; part->disk->d_name = part->name; part->disk->d_drv1 = part; @@ -1947,7 +1944,6 @@ sddadone(struct cam_periph *periph, union ccb *done_ccb) path = done_ccb->ccb_h.path; CAM_DEBUG(path, CAM_DEBUG_TRACE, ("sddadone\n")); -// cam_periph_lock(periph); if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { CAM_DEBUG(path, CAM_DEBUG_TRACE, ("Error!!!\n")); if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)