Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 514565ff authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Greg Kroah-Hartman
Browse files

media: cobalt: Use FIELD_GET() to extract Link Width 



[ Upstream commit f301fedbeecfdce91cb898d6fa5e62f269801fee ]

Use FIELD_GET() to extract PCIe Negotiated and Maximum Link Width fields
instead of custom masking and shifting.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2bb42a27

drivers/media/pci/cobalt/cobalt-driver.c

+6 −5
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 *  All rights reserved.

 */



#include <linux/bitfield.h>

#include <linux/delay.h>

#include <media/i2c/adv7604.h>

#include <media/i2c/adv7842.h>
@@ -210,17 +211,17 @@ void cobalt_pcie_status_show(struct cobalt *cobalt) 
	pcie_capability_read_word(pci_dev, PCI_EXP_LNKSTA, &stat);

	cobalt_info("PCIe link capability 0x%08x: %s per lane and %u lanes\n",

			capa, get_link_speed(capa),

			(capa & PCI_EXP_LNKCAP_MLW) >> 4);

			FIELD_GET(PCI_EXP_LNKCAP_MLW, capa));

	cobalt_info("PCIe link control 0x%04x\n", ctrl);

	cobalt_info("PCIe link status 0x%04x: %s per lane and %u lanes\n",

		    stat, get_link_speed(stat),

		    (stat & PCI_EXP_LNKSTA_NLW) >> 4);

		    FIELD_GET(PCI_EXP_LNKSTA_NLW, stat));



	/* Bus */

	pcie_capability_read_dword(pci_bus_dev, PCI_EXP_LNKCAP, &capa);

	cobalt_info("PCIe bus link capability 0x%08x: %s per lane and %u lanes\n",

			capa, get_link_speed(capa),

			(capa & PCI_EXP_LNKCAP_MLW) >> 4);

			FIELD_GET(PCI_EXP_LNKCAP_MLW, capa));



	/* Slot */

	pcie_capability_read_dword(pci_dev, PCI_EXP_SLTCAP, &capa);
@@ -239,7 +240,7 @@ static unsigned pcie_link_get_lanes(struct cobalt *cobalt) 
	if (!pci_is_pcie(pci_dev))

		return 0;

	pcie_capability_read_word(pci_dev, PCI_EXP_LNKSTA, &link);

	return (link & PCI_EXP_LNKSTA_NLW) >> 4;

	return FIELD_GET(PCI_EXP_LNKSTA_NLW, link);

}



static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt)
@@ -250,7 +251,7 @@ static unsigned pcie_bus_link_get_lanes(struct cobalt *cobalt) 
	if (!pci_is_pcie(pci_dev))

		return 0;

	pcie_capability_read_dword(pci_dev, PCI_EXP_LNKCAP, &link);

	return (link & PCI_EXP_LNKCAP_MLW) >> 4;

	return FIELD_GET(PCI_EXP_LNKCAP_MLW, link);

}



static void msi_config_show(struct cobalt *cobalt, struct pci_dev *pci_dev)