[patch] staging: lustre: ptlrpc: silence a shift wrapping warning
"svcpt->scp_hist_seq" is a u64 so static checkers complain that 1U should be 1ULL. I looked at REQS_SEQ_SHIFT() a little and it seems to be capped by the number of CPUs online and the amount of memory, but I think it could go above 32 possibly. Signed-off-by: Dan Carpenter --- I have not tested this change. diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c index 49f3e63..ae1650d 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/events.c +++ b/drivers/staging/lustre/lustre/ptlrpc/events.c @@ -277,7 +277,7 @@ static void ptlrpc_req_add_history(struct ptlrpc_service_part *svcpt, * then we hope there will be less RPCs per bucket at some * point, and sequence will catch up again */ - svcpt->scp_hist_seq += (1U << REQS_SEQ_SHIFT(svcpt)); + svcpt->scp_hist_seq += (1ULL << REQS_SEQ_SHIFT(svcpt)); new_seq = svcpt->scp_hist_seq; } ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] drivers: staging: rtl8188eu: include: wifi: Unnecessary do-while removed from macro
On Sun, Jan 15, 2017 at 01:08:15AM +0530, Kartikey Singh wrote: > On Sat, Jan 14, 2017 at 07:38:01PM +0100, Greg KH wrote: > > On Sat, Jan 14, 2017 at 11:53:36PM +0530, Kartikey Singh wrote: > > > do while loop removed from single statement macro > > > > > > Signed-off-by: Kartikey Singh > > > --- > > > drivers/staging/rtl8188eu/include/wifi.h | 4 +--- > > > 1 file changed, 1 insertion(+), 3 deletions(-) > > > > > > diff --git a/drivers/staging/rtl8188eu/include/wifi.h > > > b/drivers/staging/rtl8188eu/include/wifi.h > > > index 9e08e68..57db709 100644 > > > --- a/drivers/staging/rtl8188eu/include/wifi.h > > > +++ b/drivers/staging/rtl8188eu/include/wifi.h > > > @@ -481,9 +481,7 @@ static inline int IsFrameTypeCtrl(unsigned char > > > *pframe) > > > > > > --*/ > > > > > > #define SetOrderBit(pbuf)\ > > > - do { \ > > > - *(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \ > > > - } while (0) > > > + (*(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_)) > > > > This macro is never used, so it could just be removed, right? > > > > > #define GetOrderBit(pbuf)\ > > > (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) > > > > Same with that one. Care to do that type of fixup instead please? > > > > thanks, > > > > greg k-h > I think that macro is needed. I don't see it being used anywhere, do you? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] drivers: staging: rtl8188eu: include: wifi: Unnecessary do-while removed from macro
On Sat, Jan 14, 2017 at 10:53:04PM +0300, Ivan Safonov wrote: > On 01/14/2017 10:40 PM, Greg KH wrote: > > On Sun, Jan 15, 2017 at 12:44:41AM +0530, Kartikey singh wrote: > > Even better yet, remove it and rebuild the driver and see if it > > breaks :) > > Only if the code is not between #ifn?def / #endif... Heh, fair enough, but it usually is a good sign if you do a build, along with a search, that you are safe to remove something. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] drivers: staging: rtl8188eu: include: Removed unnecssary defined macros
On Sun, Jan 15, 2017 at 01:09:23PM +0530, Kartikey Singh wrote: > Removed macros not in use. > > Signed-off-by: Kartikey Singh > --- > drivers/staging/rtl8188eu/include/wifi.h | 12 +++- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/staging/rtl8188eu/include/wifi.h > b/drivers/staging/rtl8188eu/include/wifi.h > index 9e08e68..9c9c334 100644 > --- a/drivers/staging/rtl8188eu/include/wifi.h > +++ b/drivers/staging/rtl8188eu/include/wifi.h > @@ -480,15 +480,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) > Below is the definition for 802.11n > > --*/ > > -#define SetOrderBit(pbuf)\ > - do { \ > - *(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \ > - } while (0) > - > -#define GetOrderBit(pbuf)\ > - (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) > - > - That's good, but: > /** > * struct rtw_ieee80211_bar - HT Block Ack Request > * > @@ -758,6 +749,8 @@ enum ht_cap_ampdu_factor { > #define P2P_STATUS_FAIL_USER_REJECT 0x0B > > /* Value of Invitation Flags Attribute */ > + > +/* > #define P2P_INVITATION_FLAGS_PERSISTENT BIT(0) > > #define DMP_P2P_DEVCAP_SUPPORT (P2P_DEVCAP_SERVICE_DISCOVERY | \ > @@ -766,6 +759,7 @@ enum ht_cap_ampdu_factor { > P2P_DEVCAP_INVITATION_PROC) > > #define DMP_P2P_GRPCAP_SUPPORT (P2P_GRPCAP_INTRABSS) > +*/ Why did you comment these out and not just remove them? No need keeping around useless stuff, right? thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] drivers: staging: rtl8188eu: include: wifi: Removed unnecessary defined macros
Removed macros not in use. Signed-off-by: Kartikey Singh --- drivers/staging/rtl8188eu/include/wifi.h | 17 - 1 file changed, 17 deletions(-) diff --git a/drivers/staging/rtl8188eu/include/wifi.h b/drivers/staging/rtl8188eu/include/wifi.h index 9e08e68..e10de68 100644 --- a/drivers/staging/rtl8188eu/include/wifi.h +++ b/drivers/staging/rtl8188eu/include/wifi.h @@ -480,15 +480,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe) Below is the definition for 802.11n --*/ -#define SetOrderBit(pbuf) \ - do { \ - *(unsigned short *)(pbuf) |= cpu_to_le16(_ORDER_); \ - } while (0) - -#define GetOrderBit(pbuf) \ - (((*(unsigned short *)(pbuf)) & le16_to_cpu(_ORDER_)) != 0) - - /** * struct rtw_ieee80211_bar - HT Block Ack Request * @@ -758,14 +749,6 @@ enum ht_cap_ampdu_factor { #defineP2P_STATUS_FAIL_USER_REJECT 0x0B /* Value of Invitation Flags Attribute */ -#defineP2P_INVITATION_FLAGS_PERSISTENT BIT(0) - -#defineDMP_P2P_DEVCAP_SUPPORT (P2P_DEVCAP_SERVICE_DISCOVERY | \ - P2P_DEVCAP_CLIENT_DISCOVERABILITY | \ - P2P_DEVCAP_CONCURRENT_OPERATION | \ - P2P_DEVCAP_INVITATION_PROC) - -#defineDMP_P2P_GRPCAP_SUPPORT (P2P_GRPCAP_INTRABSS) /* Value of Device Capability Bitmap */ #defineP2P_DEVCAP_SERVICE_DISCOVERYBIT(0) -- 2.9.3 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] staging: rtl8192e: rtl8192e: Remove NULL test before vfree
vfree frees the virtually continuous block of memory beginning at addr. If addr is NULL, no operation is performed. So, NULL test is not needed before vfree. Signed-off-by: Shyam Saini --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c index 8a9172a..4bf7041 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -2695,10 +2695,8 @@ static void _rtl92e_pci_disconnect(struct pci_dev *pdev) priv->polling_timer_on = 0; _rtl92e_down(dev, true); rtl92e_dm_deinit(dev); - if (priv->pFirmware) { - vfree(priv->pFirmware); - priv->pFirmware = NULL; - } + vfree(priv->pFirmware); + priv->pFirmware = NULL; _rtl92e_free_rx_ring(dev); for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) _rtl92e_free_tx_ring(dev, i); -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 02/19] staging: iio: isl29028: remove enable flag from isl29028_enable_proximity()
On 14/01/17 20:00, Brian Masney wrote: > On Sun, Dec 04, 2016 at 11:16:04AM +, Jonathan Cameron wrote: >> On 04/12/16 02:19, Brian Masney wrote: >>> isl29028_enable_proximity() has a boolean argument named enable. This >>> function is only called once and the enable flag is set to true in that >>> call. This patch removes the enable parameter from that function. >>> >>> Signed-off-by: Brian Masney >> >> The first thing that strikes me about this, is why do we have an enable >> only function? >> >> I think the intention was probably that we also disable the proximity >> sensing after the >> reading was done... Ideally we'd do this a little more cleverly, >> perhaps using runtime >> pm so that if someone is requesting a stream of proximity measurements, >> we won't end up >> powering up and down each time. >> >> It's a little 'interesting' as we would want to power this element down >> even if we do >> have a continuous stream of reads on the ALS. As such we may need to >> roll our own >> equivalent of runtime pm. >> >> In the first instance, I'd just put a disable after the reading is >> taken. This will >> make a bit of a mockery of the faster sampling frequencies but there we >> are! >> >> - >> >> On second thoughts (stupid email is hiding somewhere to be sent when I >> have wifi so can't reply to it) perhaps this is a coarse way of only >> turning proximity on if the LED is present? Not sure... > > Hi Jonathan, > > I chained your two replies together above. I am probably stating the > obvious here, but I've verified with an oscilloscope that the IRDR pin > that drives the external LED is off when the chip is first initialized > and ALS readings are taken. The IRDR pin fluctuates between high and low > every 100us (if memory serves me right) once the first proximity reading > is taken until the chip is suspended. > > What do you think about enabling runtime auto suspend after say 2 > seconds for the whole device? There is the situation that you describe > where if someone is continuously polling the ALS but asks for a single > proximity reading. The external LED will stay on in that case. Once the > chip is suspended, and later resumes, the IRDR pin that drives the > external LED will be off until the user asks for another proximity > reading. That would allow for the faster sampling frequency. > > If you still prefer, I'll go the route of shutting down the IRDR pin > after a proximity reading is taken. Perhaps runtime auto suspend for the whole thing is the simplest option. I don't mind that much either way. Jonathan > > Brian > ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH] hv: use substraction to update ring buffer index
> From: devel [mailto:driverdev-devel-boun...@linuxdriverproject.org] On > Behalf Of Long Li > Sent: Thursday, January 5, 2017 12:08 > To: KY Srinivasan ; Haiyang Zhang > > Cc: de...@linuxdriverproject.org; linux-ker...@vger.kernel.org > Subject: [PATCH] hv: use substraction to update ring buffer index > > From: Long Li > > The ring buffer code uses %= to calculate index. For x86/64, %= compiles to > div, more than 10 times slower than sub. > > Replace div with sub for this data heavy code path. > > Signed-off-by: Long Li > --- > drivers/hv/ring_buffer.c | 9 ++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/hv/ring_buffer.c b/drivers/hv/ring_buffer.c > index cd49cb1..f8eee6e 100644 > --- a/drivers/hv/ring_buffer.c > +++ b/drivers/hv/ring_buffer.c > @@ -135,7 +135,8 @@ hv_get_next_readlocation_withoffset(struct > hv_ring_buffer_info *ring_info, > u32 next = ring_info->ring_buffer->read_index; > > next += offset; > - next %= ring_info->ring_datasize; > + if (next >= ring_info->ring_datasize) > + next -= ring_info->ring_datasize; > > return next; > } > @@ -179,7 +180,8 @@ static u32 hv_copyfrom_ringbuffer( > memcpy(dest, ring_buffer + start_read_offset, destlen); > > start_read_offset += destlen; > - start_read_offset %= ring_buffer_size; > + if (start_read_offset >= ring_buffer_size) > + start_read_offset -= ring_buffer_size; > > return start_read_offset; > } > @@ -201,7 +203,8 @@ static u32 hv_copyto_ringbuffer( > memcpy(ring_buffer + start_write_offset, src, srclen); > > start_write_offset += srclen; > - start_write_offset %= ring_buffer_size; > + if (start_write_offset >= ring_buffer_size) > + start_write_offset -= ring_buffer_size; > > return start_write_offset; > } Hi Long, I guess you want to fix put_pkt_raw() too. :-) Thanks, -- Dexuan ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [lustre-devel] [patch] staging: lustre: ptlrpc: silence a shift wrapping warning
On Jan 15, 2017, at 3:14 AM, Dan Carpenter wrote: > "svcpt->scp_hist_seq" is a u64 so static checkers complain that 1U > should be 1ULL. I looked at REQS_SEQ_SHIFT() a little and it seems to > be capped by the number of CPUs online and the amount of memory, but I > think it could go above 32 possibly. > > Signed-off-by: Dan Carpenter Reviewed-by: Oleg Drokin > --- > I have not tested this change. > > diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c > b/drivers/staging/lustre/lustre/ptlrpc/events.c > index 49f3e63..ae1650d 100644 > --- a/drivers/staging/lustre/lustre/ptlrpc/events.c > +++ b/drivers/staging/lustre/lustre/ptlrpc/events.c > @@ -277,7 +277,7 @@ static void ptlrpc_req_add_history(struct > ptlrpc_service_part *svcpt, >* then we hope there will be less RPCs per bucket at some >* point, and sequence will catch up again >*/ > - svcpt->scp_hist_seq += (1U << REQS_SEQ_SHIFT(svcpt)); > + svcpt->scp_hist_seq += (1ULL << REQS_SEQ_SHIFT(svcpt)); > new_seq = svcpt->scp_hist_seq; > } > > ___ > lustre-devel mailing list > lustre-de...@lists.lustre.org > http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] rtl8188eu: core: Remove NULL test before vfree
vfree frees the virtually continuous block of memory beginning at addr. If addr is NULL, no operation is performed. So, NULL test is not needed before vfree(). Signed-off-by: Shyam Saini --- drivers/staging/rtl8188eu/core/rtw_xmit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index b60b126..2a65e32 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c @@ -246,8 +246,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) pxmitbuf++; } - if (pxmitpriv->pallocated_xmit_extbuf) - vfree(pxmitpriv->pallocated_xmit_extbuf); + vfree(pxmitpriv->pallocated_xmit_extbuf); rtw_free_hwxmits(padapter); -- 2.7.4 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
Changed bare use of 'unsigned' to the prefered us of 'unsigned int' found using checkpatch Signed-off-by: Derek Robson --- drivers/staging/media/bcm2048/radio-bcm2048.c | 44 +-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c index 37bd439ee08b..b1923a3e4483 100644 --- a/drivers/staging/media/bcm2048/radio-bcm2048.c +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c @@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device *dev,\ return count; \ } -DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0) - -DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3) - -DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) + +DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, int, "%u", value > 3) + +DEFINE_SYSFS_PROPERTY(rds, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, int, "%u", 0) property_read(rds_pi, unsigned int, "%x") property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1)) property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1)) @@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int, "%u") property_read(region_top_frequency, unsigned int, "%u") property_signed_read(fm_carrier_error, int, "%d") property_signed_read(fm_rssi, int, "%d") -DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(region, unsigned int, int, "%u", 0) static struct device_attribute attrs[] = { __ATTR(power_state, 0644, bcm2048_power_state_read, -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
> On Jan 15, 2017, at 10:30 PM, Derek Robson wrote: > > Changed bare use of 'unsigned' to the prefered us of 'unsigned int' > found using checkpatch Just wondering if you compiled? This patch looks exactly like a patch I tried, but it didn't compile. > Signed-off-by: Derek Robson > --- > drivers/staging/media/bcm2048/radio-bcm2048.c | 44 +-- > 1 file changed, 22 insertions(+), 22 deletions(-) > > diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c > b/drivers/staging/media/bcm2048/radio-bcm2048.c > index 37bd439ee08b..b1923a3e4483 100644 > --- a/drivers/staging/media/bcm2048/radio-bcm2048.c > +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c > @@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device > *dev,\ >return count;\ > } > > -DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0) > - > -DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3) > - > -DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0) > -DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) > + > +DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, int, "%u", value > > 3) > + > +DEFINE_SYSFS_PROPERTY(rds, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, int, "%u", 0) > property_read(rds_pi, unsigned int, "%x") > property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1)) > property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1)) > @@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int, > "%u") > property_read(region_top_frequency, unsigned int, "%u") > property_signed_read(fm_carrier_error, int, "%d") > property_signed_read(fm_rssi, int, "%d") > -DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0) > +DEFINE_SYSFS_PROPERTY(region, unsigned int, int, "%u", 0) > > static struct device_attribute attrs[] = { >__ATTR(power_state, 0644, bcm2048_power_state_read, > -- > 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
Hi Derek, [auto build test ERROR on linuxtv-media/master] [also build test ERROR on v4.10-rc4 next-20170113] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system] url: https://github.com/0day-ci/linux/commits/Derek-Robson/Staging-media-bcm2048-style-fix-bare-use-of-unsigned/20170116-123500 base: git://linuxtv.org/media_tree.git master config: i386-randconfig-x005-201703 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_power_state_write': >> drivers/staging/media/bcm2048/radio-bcm2048.c:2023:50: error: two or more >> data types in declaration specifiers DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ >> drivers/staging/media/bcm2048/radio-bcm2048.c:2023:1: note: in expansion of >> macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_mute_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2024:43: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2024:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_audio_route_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2025:50: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2025:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_dac_output_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2026:49: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2026:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_fm_hi_lo_injection_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2028:57: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2028:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_fm_frequency_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2029:51: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c:1943:2: note: in definition of macro 'property_write' type value; \ ^~~~ drivers/staging/media/bcm2048/radio-bcm2048.c:2029:1: note: in expansion of macro 'DEFINE_SYSFS_PROPERTY' DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) ^ drivers/staging/media/bcm2048/radio-bcm2048.c: In function 'bcm2048_fm_af_frequency_write': drivers/staging/media/bcm2048/radio-bcm2048.c:2030:54: error: two or more data types in declaration specifiers DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0)
Re: [PATCH] Staging: media: bcm2048: style fix - bare use of unsigned
On Sun, Jan 15, 2017 at 10:40:02PM -0600, Scott Matheina wrote: > > > > On Jan 15, 2017, at 10:30 PM, Derek Robson wrote: > > > > Changed bare use of 'unsigned' to the prefered us of 'unsigned int' > > found using checkpatch > > Just wondering if you compiled? This patch looks exactly like a patch I > tried, but it didn't compile. > It complied for me, I am on an X86 system. > > Signed-off-by: Derek Robson > > --- > > drivers/staging/media/bcm2048/radio-bcm2048.c | 44 > > +-- > > 1 file changed, 22 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c > > b/drivers/staging/media/bcm2048/radio-bcm2048.c > > index 37bd439ee08b..b1923a3e4483 100644 > > --- a/drivers/staging/media/bcm2048/radio-bcm2048.c > > +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c > > @@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device > > *dev,\ > >return count;\ > > } > > > > -DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0) > > - > > -DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3) > > - > > -DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0) > > -DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(power_state, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(mute, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, int, "%u", 0) > > + > > +DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, int, "%u", value > > > 3) > > + > > +DEFINE_SYSFS_PROPERTY(rds, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, int, "%u", 0) > > property_read(rds_pi, unsigned int, "%x") > > property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1)) > > property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1)) > > @@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int, > > "%u") > > property_read(region_top_frequency, unsigned int, "%u") > > property_signed_read(fm_carrier_error, int, "%d") > > property_signed_read(fm_rssi, int, "%d") > > -DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0) > > +DEFINE_SYSFS_PROPERTY(region, unsigned int, int, "%u", 0) > > > > static struct device_attribute attrs[] = { > >__ATTR(power_state, 0644, bcm2048_power_state_read, > > -- > > 2.11.0 > ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2] Staging: media: bcm2048: style fix - bare use of unsigned
Changed macro to not pass signedness and size as seprate fields. This is to improve code readablity. Signed-off-by: Derek Robson --- version #1 broke the build because I missunderstood the output of checkpatch. drivers/staging/media/bcm2048/radio-bcm2048.c | 48 +-- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c index 37bd439ee08b..db889c0943d5 100644 --- a/drivers/staging/media/bcm2048/radio-bcm2048.c +++ b/drivers/staging/media/bcm2048/radio-bcm2048.c @@ -1992,8 +1992,8 @@ static ssize_t bcm2048_##prop##_read(struct device *dev, \ return sprintf(buf, mask "\n", value); \ } -#define DEFINE_SYSFS_PROPERTY(prop, signal, size, mask, check) \ -property_write(prop, signal size, mask, check) \ +#define DEFINE_SYSFS_PROPERTY(prop, size, mask, check) \ +property_write(prop, size, mask, check)\ property_read(prop, size, mask) #define property_str_read(prop, size) \ @@ -2020,27 +2020,27 @@ static ssize_t bcm2048_##prop##_read(struct device *dev,\ return count; \ } -DEFINE_SYSFS_PROPERTY(power_state, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(mute, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(audio_route, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(dac_output, unsigned, int, "%u", 0) - -DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned, int, "%u", value > 3) - -DEFINE_SYSFS_PROPERTY(rds, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned, int, "%u", 0) -DEFINE_SYSFS_PROPERTY(rds_wline, unsigned, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(power_state, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(mute, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(audio_route, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(dac_output, unsigned int, "%u", 0) + +DEFINE_SYSFS_PROPERTY(fm_hi_lo_injection, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_frequency, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_af_frequency, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_deemphasis, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_rds_mask, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_best_tune_mode, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_search_rssi_threshold, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_search_mode_direction, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(fm_search_tune_mode, unsigned int, "%u", value > 3) + +DEFINE_SYSFS_PROPERTY(rds, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_b_block_mask, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_b_block_match, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_pi_mask, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_pi_match, unsigned int, "%u", 0) +DEFINE_SYSFS_PROPERTY(rds_wline, unsigned int, "%u", 0) property_read(rds_pi, unsigned int, "%x") property_str_read(rds_rt, (BCM2048_MAX_RDS_RT + 1)) property_str_read(rds_ps, (BCM2048_MAX_RDS_PS + 1)) @@ -2052,7 +2052,7 @@ property_read(region_bottom_frequency, unsigned int, "%u") property_read(region_top_frequency, unsigned int, "%u") property_signed_read(fm_carrier_error, int, "%d") property_signed_read(fm_rssi, int, "%d") -DEFINE_SYSFS_PROPERTY(region, unsigned, int, "%u", 0) +DEFINE_SYSFS_PROPERTY(region, unsigned int, "%u", 0) static struct device_attribute attrs[] = { __ATTR(power_state, 0644, bcm2048_power_state_read, -- 2.11.0 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel