tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[media] af9015: use logic or instead of sum numbers
Style issue.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
authored by
Antti Palosaari
and committed by
Mauro Carvalho Chehab
f68baeff
4c0cfa24
+13
-13
+13
-13
drivers/media/dvb/dvb-usb/af9015.c
+13
-13
drivers/media/dvb/dvb-usb/af9015.c
···
744
744
};
745
745
746
746
static const struct af9015_rc_setup af9015_rc_setup_usbids[] = {
747
-
{ (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_RC,
747
+
{ (USB_VID_TERRATEC << 16) | USB_PID_TERRATEC_CINERGY_T_STICK_RC,
748
748
RC_MAP_TERRATEC_SLIM_2 },
749
-
{ (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC,
749
+
{ (USB_VID_TERRATEC << 16) | USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC,
750
750
RC_MAP_TERRATEC_SLIM },
751
-
{ (USB_VID_VISIONPLUS << 16) + USB_PID_AZUREWAVE_AD_TU700,
751
+
{ (USB_VID_VISIONPLUS << 16) | USB_PID_AZUREWAVE_AD_TU700,
752
752
RC_MAP_AZUREWAVE_AD_TU700 },
753
-
{ (USB_VID_VISIONPLUS << 16) + USB_PID_TINYTWIN,
753
+
{ (USB_VID_VISIONPLUS << 16) | USB_PID_TINYTWIN,
754
754
RC_MAP_AZUREWAVE_AD_TU700 },
755
-
{ (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGI_VOX_MINI_III,
755
+
{ (USB_VID_MSI_2 << 16) | USB_PID_MSI_DIGI_VOX_MINI_III,
756
756
RC_MAP_MSI_DIGIVOX_III },
757
-
{ (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGIVOX_DUO,
757
+
{ (USB_VID_MSI_2 << 16) | USB_PID_MSI_DIGIVOX_DUO,
758
758
RC_MAP_MSI_DIGIVOX_III },
759
-
{ (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV_DONGLE_GOLD,
759
+
{ (USB_VID_LEADTEK << 16) | USB_PID_WINFAST_DTV_DONGLE_GOLD,
760
760
RC_MAP_LEADTEK_Y04G0051 },
761
-
{ (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV2000DS,
761
+
{ (USB_VID_LEADTEK << 16) | USB_PID_WINFAST_DTV2000DS,
762
762
RC_MAP_LEADTEK_Y04G0051 },
763
-
{ (USB_VID_AVERMEDIA << 16) + USB_PID_AVERMEDIA_VOLAR_X,
763
+
{ (USB_VID_AVERMEDIA << 16) | USB_PID_AVERMEDIA_VOLAR_X,
764
764
RC_MAP_AVERMEDIA_M135A },
765
-
{ (USB_VID_AFATECH << 16) + USB_PID_TREKSTOR_DVBT,
765
+
{ (USB_VID_AFATECH << 16) | USB_PID_TREKSTOR_DVBT,
766
766
RC_MAP_TREKSTOR },
767
-
{ (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2,
767
+
{ (USB_VID_KWORLD_2 << 16) | USB_PID_TINYTWIN_2,
768
768
RC_MAP_DIGITALNOW_TINYTWIN },
769
-
{ (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3,
769
+
{ (USB_VID_GTEK << 16) | USB_PID_TINYTWIN_3,
770
770
RC_MAP_DIGITALNOW_TINYTWIN },
771
-
{ (USB_VID_KWORLD_2 << 16) + USB_PID_SVEON_STV22,
771
+
{ (USB_VID_KWORLD_2 << 16) | USB_PID_SVEON_STV22,
772
772
RC_MAP_MSI_DIGIVOX_III },
773
773
{ }
774
774
};