Skip to content

Commit 0dbe15f

Browse files
author
Stefan Richter
committed
firewire: ohci: beautify some macro definitions
a) Sort device IDs by vendor -- device -- revision. b) Write quirk flags in hexadecimal. This affects the user-visible output of "modinfo firewire-ohci". Since more flags have been added recently, it is now easier to cope with them in hexadecimal represen- tation. Besides, the device-specific combination of quirk flags is shown in hexadecimal in the kernel log too. (And firewire-sbp2 presents its own quirk flags in modinfo as hexadecimals as well.) Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
1 parent af53122 commit 0dbe15f

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

drivers/firewire/ohci.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,24 +271,24 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card)
271271

272272
static char ohci_driver_name[] = KBUILD_MODNAME;
273273

274+
#define PCI_VENDOR_ID_PINNACLE_SYSTEMS 0x11bd
274275
#define PCI_DEVICE_ID_AGERE_FW643 0x5901
275276
#define PCI_DEVICE_ID_CREATIVE_SB1394 0x4001
276277
#define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
277278
#define PCI_DEVICE_ID_TI_TSB12LV22 0x8009
278279
#define PCI_DEVICE_ID_TI_TSB12LV26 0x8020
279280
#define PCI_DEVICE_ID_TI_TSB82AA2 0x8025
280281
#define PCI_DEVICE_ID_VIA_VT630X 0x3044
281-
#define PCI_VENDOR_ID_PINNACLE_SYSTEMS 0x11bd
282282
#define PCI_REV_ID_VIA_VT6306 0x46
283283

284-
#define QUIRK_CYCLE_TIMER 1
285-
#define QUIRK_RESET_PACKET 2
286-
#define QUIRK_BE_HEADERS 4
287-
#define QUIRK_NO_1394A 8
288-
#define QUIRK_NO_MSI 16
289-
#define QUIRK_TI_SLLZ059 32
290-
#define QUIRK_IR_WAKE 64
291-
#define QUIRK_PHY_LCTRL_TIMEOUT 128
284+
#define QUIRK_CYCLE_TIMER 0x1
285+
#define QUIRK_RESET_PACKET 0x2
286+
#define QUIRK_BE_HEADERS 0x4
287+
#define QUIRK_NO_1394A 0x8
288+
#define QUIRK_NO_MSI 0x10
289+
#define QUIRK_TI_SLLZ059 0x20
290+
#define QUIRK_IR_WAKE 0x40
291+
#define QUIRK_PHY_LCTRL_TIMEOUT 0x80
292292

293293
/* In case of multiple matches in ohci_quirks[], only the first one is used. */
294294
static const struct {

0 commit comments

Comments
 (0)