diff mbox

[9/9] hackrf: do not set human readable name for formats

Message ID 1433592188-31748-9-git-send-email-crope@iki.fi (mailing list archive)
State New, archived
Headers show

Commit Message

Antti Palosaari June 6, 2015, 12:03 p.m. UTC 
Format names are set by core nowadays. Remove name from driver.

Signed-off-by: Antti Palosaari <crope@iki.fi>
---
 drivers/media/usb/hackrf/hackrf.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Hans Verkuil June 8, 2015, 9:20 a.m. UTC | #1 
On 06/06/2015 02:03 PM, Antti Palosaari wrote:
> Format names are set by core nowadays. Remove name from driver.
> 
> Signed-off-by: Antti Palosaari <crope@iki.fi>

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Regards,

	Hans

> ---
>  drivers/media/usb/hackrf/hackrf.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
> index 6ad6937..1f9483d 100644
> --- a/drivers/media/usb/hackrf/hackrf.c
> +++ b/drivers/media/usb/hackrf/hackrf.c
> @@ -69,7 +69,6 @@ static const struct v4l2_frequency_band bands_rx_tx[] = {
>  
>  /* stream formats */
>  struct hackrf_format {
> -	char	*name;
>  	u32	pixelformat;
>  	u32	buffersize;
>  };
> @@ -77,7 +76,6 @@ struct hackrf_format {
>  /* format descriptions for capture and preview */
>  static struct hackrf_format formats[] = {
>  	{
> -		.name		= "Complex S8",
>  		.pixelformat	= V4L2_SDR_FMT_CS8,
>  		.buffersize	= BULK_BUFFER_SIZE,
>  	},
> @@ -977,7 +975,6 @@ static int hackrf_enum_fmt_sdr_cap(struct file *file, void *priv,
>  	if (f->index >= NUM_FORMATS)
>  		return -EINVAL;
>  
> -	strlcpy(f->description, formats[f->index].name, sizeof(f->description));
>  	f->pixelformat = formats[f->index].pixelformat;
>  
>  	return 0;
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
index 6ad6937..1f9483d 100644
--- a/drivers/media/usb/hackrf/hackrf.c
+++ b/drivers/media/usb/hackrf/hackrf.c
@@ -69,7 +69,6 @@  static const struct v4l2_frequency_band bands_rx_tx[] = {
 
 /* stream formats */
 struct hackrf_format {
-	char	*name;
 	u32	pixelformat;
 	u32	buffersize;
 };
@@ -77,7 +76,6 @@  struct hackrf_format {
 /* format descriptions for capture and preview */
 static struct hackrf_format formats[] = {
 	{
-		.name		= "Complex S8",
 		.pixelformat	= V4L2_SDR_FMT_CS8,
 		.buffersize	= BULK_BUFFER_SIZE,
 	},
@@ -977,7 +975,6 @@  static int hackrf_enum_fmt_sdr_cap(struct file *file, void *priv,
 	if (f->index >= NUM_FORMATS)
 		return -EINVAL;
 
-	strlcpy(f->description, formats[f->index].name, sizeof(f->description));
 	f->pixelformat = formats[f->index].pixelformat;
 
 	return 0;