diff options
Diffstat (limited to 'drivers/media/radio')
| -rw-r--r-- | drivers/media/radio/radio-gemtek.c | 2 | ||||
| -rw-r--r-- | drivers/media/radio/radio-trust.c | 1 | ||||
| -rw-r--r-- | drivers/media/radio/si470x/radio-si470x-i2c.c | 5 | ||||
| -rw-r--r-- | drivers/media/radio/si470x/radio-si470x-usb.c | 5 | ||||
| -rw-r--r-- | drivers/media/radio/si4713/si4713.c | 5 | ||||
| -rw-r--r-- | drivers/media/radio/wl128x/fmdrv_common.h | 88 |
6 files changed, 53 insertions, 53 deletions
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c index 06400112aebb..a532f63aa9d9 100644 --- a/drivers/media/radio/radio-gemtek.c +++ b/drivers/media/radio/radio-gemtek.c @@ -125,7 +125,7 @@ struct gemtek { #define BU2614_FMUN_SHIFT (BU2614_VOID2_BITS + BU2614_VOID2_SHIFT) #define BU2614_TEST_SHIFT (BU2614_FMUN_BITS + BU2614_FMUN_SHIFT) -#define MKMASK(field) (((1<<BU2614_##field##_BITS) - 1) << \ +#define MKMASK(field) (((1UL<<BU2614_##field##_BITS) - 1) << \ BU2614_##field##_SHIFT) #define BU2614_PORT_MASK MKMASK(PORT) #define BU2614_FREQ_MASK MKMASK(FREQ) diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c index 2fc009509c7c..dfb8b62f0e2b 100644 --- a/drivers/media/radio/radio-trust.c +++ b/drivers/media/radio/radio-trust.c @@ -16,7 +16,6 @@ * Converted to V4L2 API by Mauro Carvalho Chehab <mchehab@kernel.org> */ -#include <stdarg.h> #include <linux/module.h> #include <linux/init.h> #include <linux/ioport.h> diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c index 7d53422b3b56..7541698a0be1 100644 --- a/drivers/media/radio/si470x/radio-si470x-i2c.c +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c @@ -330,8 +330,7 @@ end: /* * si470x_i2c_probe - probe for the device */ -static int si470x_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int si470x_i2c_probe(struct i2c_client *client) { struct si470x_device *radio; int retval = 0; @@ -544,7 +543,7 @@ static struct i2c_driver si470x_i2c_driver = { .pm = &si470x_i2c_pm, #endif }, - .probe = si470x_i2c_probe, + .probe_new = si470x_i2c_probe, .remove = si470x_i2c_remove, .id_table = si470x_i2c_id, }; diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c index 49073747b1e7..fedff68d8c49 100644 --- a/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/drivers/media/radio/si470x/radio-si470x-usb.c @@ -734,7 +734,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, /* start radio */ retval = si470x_start_usb(radio); if (retval < 0) - goto err_all; + goto err_buf; /* set initial frequency */ si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */ @@ -749,6 +749,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, return 0; err_all: + usb_kill_urb(radio->int_in_urb); +err_buf: kfree(radio->buffer); err_ctrl: v4l2_ctrl_handler_free(&radio->hdl); @@ -822,6 +824,7 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf) mutex_lock(&radio->lock); v4l2_device_disconnect(&radio->v4l2_dev); video_unregister_device(&radio->videodev); + usb_kill_urb(radio->int_in_urb); usb_set_intfdata(intf, NULL); mutex_unlock(&radio->lock); v4l2_device_put(&radio->v4l2_dev); diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c index 7d97de2fa56c..7f3aee495ed3 100644 --- a/drivers/media/radio/si4713/si4713.c +++ b/drivers/media/radio/si4713/si4713.c @@ -1427,8 +1427,7 @@ static const struct v4l2_ctrl_config si4713_alt_freqs_ctrl = { * I2C driver interface */ /* si4713_probe - probe for the device */ -static int si4713_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int si4713_probe(struct i2c_client *client) { struct si4713_device *sdev; struct v4l2_ctrl_handler *hdl; @@ -1660,7 +1659,7 @@ static struct i2c_driver si4713_i2c_driver = { .name = "si4713", .of_match_table = of_match_ptr(si4713_of_match), }, - .probe = si4713_probe, + .probe_new = si4713_probe, .remove = si4713_remove, .id_table = si4713_id, }; diff --git a/drivers/media/radio/wl128x/fmdrv_common.h b/drivers/media/radio/wl128x/fmdrv_common.h index 7d7a2b17aa76..6a287eadae75 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.h +++ b/drivers/media/radio/wl128x/fmdrv_common.h @@ -159,18 +159,18 @@ struct fm_event_msg_hdr { #define FM_DISABLE 0 /* FLAG_GET register bits */ -#define FM_FR_EVENT (1 << 0) -#define FM_BL_EVENT (1 << 1) -#define FM_RDS_EVENT (1 << 2) -#define FM_BBLK_EVENT (1 << 3) -#define FM_LSYNC_EVENT (1 << 4) -#define FM_LEV_EVENT (1 << 5) -#define FM_IFFR_EVENT (1 << 6) -#define FM_PI_EVENT (1 << 7) -#define FM_PD_EVENT (1 << 8) -#define FM_STIC_EVENT (1 << 9) -#define FM_MAL_EVENT (1 << 10) -#define FM_POW_ENB_EVENT (1 << 11) +#define FM_FR_EVENT BIT(0) +#define FM_BL_EVENT BIT(1) +#define FM_RDS_EVENT BIT(2) +#define FM_BBLK_EVENT BIT(3) +#define FM_LSYNC_EVENT BIT(4) +#define FM_LEV_EVENT BIT(5) +#define FM_IFFR_EVENT BIT(6) +#define FM_PI_EVENT BIT(7) +#define FM_PD_EVENT BIT(8) +#define FM_STIC_EVENT BIT(9) +#define FM_MAL_EVENT BIT(10) +#define FM_POW_ENB_EVENT BIT(11) /* * Firmware files of FM. ASIC ID and ASIC version will be appened to this, @@ -268,38 +268,38 @@ struct fm_event_msg_hdr { * Represents an RDS group type & version. * There are 15 groups, each group has 2 versions: A and B. */ -#define FM_RDS_GROUP_TYPE_MASK_0A ((unsigned long)1<<0) -#define FM_RDS_GROUP_TYPE_MASK_0B ((unsigned long)1<<1) -#define FM_RDS_GROUP_TYPE_MASK_1A ((unsigned long)1<<2) -#define FM_RDS_GROUP_TYPE_MASK_1B ((unsigned long)1<<3) -#define FM_RDS_GROUP_TYPE_MASK_2A ((unsigned long)1<<4) -#define FM_RDS_GROUP_TYPE_MASK_2B ((unsigned long)1<<5) -#define FM_RDS_GROUP_TYPE_MASK_3A ((unsigned long)1<<6) -#define FM_RDS_GROUP_TYPE_MASK_3B ((unsigned long)1<<7) -#define FM_RDS_GROUP_TYPE_MASK_4A ((unsigned long)1<<8) -#define FM_RDS_GROUP_TYPE_MASK_4B ((unsigned long)1<<9) -#define FM_RDS_GROUP_TYPE_MASK_5A ((unsigned long)1<<10) -#define FM_RDS_GROUP_TYPE_MASK_5B ((unsigned long)1<<11) -#define FM_RDS_GROUP_TYPE_MASK_6A ((unsigned long)1<<12) -#define FM_RDS_GROUP_TYPE_MASK_6B ((unsigned long)1<<13) -#define FM_RDS_GROUP_TYPE_MASK_7A ((unsigned long)1<<14) -#define FM_RDS_GROUP_TYPE_MASK_7B ((unsigned long)1<<15) -#define FM_RDS_GROUP_TYPE_MASK_8A ((unsigned long)1<<16) -#define FM_RDS_GROUP_TYPE_MASK_8B ((unsigned long)1<<17) -#define FM_RDS_GROUP_TYPE_MASK_9A ((unsigned long)1<<18) -#define FM_RDS_GROUP_TYPE_MASK_9B ((unsigned long)1<<19) -#define FM_RDS_GROUP_TYPE_MASK_10A ((unsigned long)1<<20) -#define FM_RDS_GROUP_TYPE_MASK_10B ((unsigned long)1<<21) -#define FM_RDS_GROUP_TYPE_MASK_11A ((unsigned long)1<<22) -#define FM_RDS_GROUP_TYPE_MASK_11B ((unsigned long)1<<23) -#define FM_RDS_GROUP_TYPE_MASK_12A ((unsigned long)1<<24) -#define FM_RDS_GROUP_TYPE_MASK_12B ((unsigned long)1<<25) -#define FM_RDS_GROUP_TYPE_MASK_13A ((unsigned long)1<<26) -#define FM_RDS_GROUP_TYPE_MASK_13B ((unsigned long)1<<27) -#define FM_RDS_GROUP_TYPE_MASK_14A ((unsigned long)1<<28) -#define FM_RDS_GROUP_TYPE_MASK_14B ((unsigned long)1<<29) -#define FM_RDS_GROUP_TYPE_MASK_15A ((unsigned long)1<<30) -#define FM_RDS_GROUP_TYPE_MASK_15B ((unsigned long)1<<31) +#define FM_RDS_GROUP_TYPE_MASK_0A BIT(0) +#define FM_RDS_GROUP_TYPE_MASK_0B BIT(1) +#define FM_RDS_GROUP_TYPE_MASK_1A BIT(2) +#define FM_RDS_GROUP_TYPE_MASK_1B BIT(3) +#define FM_RDS_GROUP_TYPE_MASK_2A BIT(4) +#define FM_RDS_GROUP_TYPE_MASK_2B BIT(5) +#define FM_RDS_GROUP_TYPE_MASK_3A BIT(6) +#define FM_RDS_GROUP_TYPE_MASK_3B BIT(7) +#define FM_RDS_GROUP_TYPE_MASK_4A BIT(8) +#define FM_RDS_GROUP_TYPE_MASK_4B BIT(9) +#define FM_RDS_GROUP_TYPE_MASK_5A BIT(10) +#define FM_RDS_GROUP_TYPE_MASK_5B BIT(11) +#define FM_RDS_GROUP_TYPE_MASK_6A BIT(12) +#define FM_RDS_GROUP_TYPE_MASK_6B BIT(13) +#define FM_RDS_GROUP_TYPE_MASK_7A BIT(14) +#define FM_RDS_GROUP_TYPE_MASK_7B BIT(15) +#define FM_RDS_GROUP_TYPE_MASK_8A BIT(16) +#define FM_RDS_GROUP_TYPE_MASK_8B BIT(17) +#define FM_RDS_GROUP_TYPE_MASK_9A BIT(18) +#define FM_RDS_GROUP_TYPE_MASK_9B BIT(19) +#define FM_RDS_GROUP_TYPE_MASK_10A BIT(20) +#define FM_RDS_GROUP_TYPE_MASK_10B BIT(21) +#define FM_RDS_GROUP_TYPE_MASK_11A BIT(22) +#define FM_RDS_GROUP_TYPE_MASK_11B BIT(23) +#define FM_RDS_GROUP_TYPE_MASK_12A BIT(24) +#define FM_RDS_GROUP_TYPE_MASK_12B BIT(25) +#define FM_RDS_GROUP_TYPE_MASK_13A BIT(26) +#define FM_RDS_GROUP_TYPE_MASK_13B BIT(27) +#define FM_RDS_GROUP_TYPE_MASK_14A BIT(28) +#define FM_RDS_GROUP_TYPE_MASK_14B BIT(29) +#define FM_RDS_GROUP_TYPE_MASK_15A BIT(30) +#define FM_RDS_GROUP_TYPE_MASK_15B BIT(31) /* RX Alternate Frequency info */ #define FM_RDS_MIN_AF 1 |